gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify Roots Column To Support Multiple Roots (#4321)

Browse Source 
* Fix 1) Roots column family to handle storing multiple slots, 2) Store all slots on the rooted path in the roots column family
This commit is contained in:
carllin
2019-05-20 19:04:18 -07:00
committed by GitHub
parent 7153abd483
commit f1e5edee14
7 changed files with 163 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/repair_service.rs
View File

@ -136,7 +136,7 @@ impl RepairService {
&cluster_info,
completed_slots_receiver,
);
Self::generate_repairs(blocktree, MAX_REPAIR_LENGTH)
Self::generate_repairs(blocktree, root, MAX_REPAIR_LENGTH)
}
}
};
@ -207,11 +207,14 @@ impl RepairService {
Ok(repairs)
}
fn generate_repairs(blocktree: &Blocktree, max_repairs: usize) -> Result<(Vec<RepairType>)> {
fn generate_repairs(
blocktree: &Blocktree,
root: u64,
max_repairs: usize,
) -> Result<(Vec<RepairType>)> {
// Slot height and blob indexes for blobs we want to repair
let mut repairs: Vec<RepairType> = vec![];
let slot = blocktree.get_root()?;
Self::generate_repairs_for_fork(blocktree, &mut repairs, max_repairs, slot);
Self::generate_repairs_for_fork(blocktree, &mut repairs, max_repairs, root);
// TODO: Incorporate gossip to determine priorities for repair?
@ -382,7 +385,7 @@ mod test {
blobs.extend(blobs2);
blocktree.write_blobs(&blobs).unwrap();
assert_eq!(
RepairService::generate_repairs(&blocktree, 2).unwrap(),
RepairService::generate_repairs(&blocktree, 0, 2).unwrap(),
vec![
RepairType::HighestBlob(0, 0),
RepairType::Orphan(0),
@ -408,7 +411,7 @@ mod test {
// Check that repair tries to patch the empty slot
assert_eq!(
RepairService::generate_repairs(&blocktree, 2).unwrap(),
RepairService::generate_repairs(&blocktree, 0, 2).unwrap(),
vec![RepairType::HighestBlob(0, 0), RepairType::Orphan(0)]
);
}
@ -447,12 +450,12 @@ mod test {
.collect();
assert_eq!(
RepairService::generate_repairs(&blocktree, std::usize::MAX).unwrap(),
RepairService::generate_repairs(&blocktree, 0, std::usize::MAX).unwrap(),
expected
);
assert_eq!(
RepairService::generate_repairs(&blocktree, expected.len() - 2).unwrap()[..],
RepairService::generate_repairs(&blocktree, 0, expected.len() - 2).unwrap()[..],
expected[0..expected.len() - 2]
);
}
@ -479,7 +482,7 @@ mod test {
let expected: Vec<RepairType> = vec![RepairType::HighestBlob(0, num_entries_per_slot)];
assert_eq!(
RepairService::generate_repairs(&blocktree, std::usize::MAX).unwrap(),
RepairService::generate_repairs(&blocktree, 0, std::usize::MAX).unwrap(),
expected
);
}