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

add_snapshot now returns SlotSnapshotPaths

Browse Source
This commit is contained in:
Michael Vines
2020-01-23 01:39:35 -07:00
parent 98fd1b3fcb
commit 49c94fad60
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ledger/src/snapshot_package.rs
View File

@ -10,6 +10,7 @@ pub type SnapshotPackageSender = Sender<SnapshotPackage>;
pub type SnapshotPackageReceiver = Receiver<SnapshotPackage>; pub type SnapshotPackageReceiver = Receiver<SnapshotPackage>;
pub type SnapshotPackageSendError = SendError<SnapshotPackage>; pub type SnapshotPackageSendError = SendError<SnapshotPackage>;
#[derive(Debug)]
pub struct SnapshotPackage { pub struct SnapshotPackage {
pub root: u64, pub root: u64,
pub slot_deltas: Vec<SlotDelta<TransactionResult<()>>>, pub slot_deltas: Vec<SlotDelta<TransactionResult<()>>>,

17
ledger/src/snapshot_utils.rs
View File

@ -139,7 +139,7 @@ where
} }
} }
pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<()> { pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<SlotSnapshotPaths> {
bank.purge_zero_lamport_accounts(); bank.purge_zero_lamport_accounts();
let slot = bank.slot(); let slot = bank.slot();
// snapshot_path/slot // snapshot_path/slot
@ -148,11 +148,7 @@ pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<()>
// the snapshot is stored as snapshot_path/slot/slot // the snapshot is stored as snapshot_path/slot/slot
let snapshot_file_path = slot_snapshot_dir.join(get_snapshot_file_name(slot)); let snapshot_file_path = slot_snapshot_dir.join(get_snapshot_file_name(slot));
info!( info!("Creating snapshot {}, path: {:?}", slot, snapshot_file_path);
"creating snapshot {}, path: {:?}",
bank.slot(),
snapshot_file_path,
);
let snapshot_file = File::create(&snapshot_file_path)?; let snapshot_file = File::create(&snapshot_file_path)?;
// snapshot writer // snapshot writer
@ -166,12 +162,13 @@ pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<()>
info!( info!(
"{} for slot {} at {:?}", "{} for slot {} at {:?}",
bank_rc_serialize, bank_rc_serialize, slot, snapshot_file_path,
bank.slot(),
snapshot_file_path,
); );
Ok(()) Ok(SlotSnapshotPaths {
slot,
snapshot_file_path,
})
} }
pub fn remove_snapshot<P: AsRef<Path>>(slot: Slot, snapshot_path: P) -> Result<()> { pub fn remove_snapshot<P: AsRef<Path>>(slot: Slot, snapshot_path: P) -> Result<()> {