blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid hardlinking as that confuses tar (#6042)

This commit is contained in:
Michael Vines 2019-09-23 20:12:16 -07:00 committed by GitHub
parent 84f74807d4
commit 7fa809c16d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/snapshot_utils.rs
View File

@ -32,19 +32,19 @@ impl PartialOrd for SlotSnapshotPaths {
} }
impl SlotSnapshotPaths { impl SlotSnapshotPaths {
fn hardlink_snapshot_directory<P: AsRef<Path>>(&self, snapshot_hardlink_dir: P) -> Result<()> { fn copy_snapshot_directory<P: AsRef<Path>>(&self, snapshot_hardlink_dir: P) -> Result<()> {
// Create a new directory in snapshot_hardlink_dir // Create a new directory in snapshot_hardlink_dir
let new_slot_hardlink_dir = snapshot_hardlink_dir.as_ref().join(self.slot.to_string()); let new_slot_hardlink_dir = snapshot_hardlink_dir.as_ref().join(self.slot.to_string());
let _ = fs::remove_dir_all(&new_slot_hardlink_dir); let _ = fs::remove_dir_all(&new_slot_hardlink_dir);
fs::create_dir_all(&new_slot_hardlink_dir)?; fs::create_dir_all(&new_slot_hardlink_dir)?;
// Hardlink the snapshot // Copy the snapshot
fs::hard_link( fs::copy(
&self.snapshot_file_path, &self.snapshot_file_path,
&new_slot_hardlink_dir.join(self.slot.to_string()), &new_slot_hardlink_dir.join(self.slot.to_string()),
)?; )?;
// Hardlink the status cache // Copy the status cache
fs::hard_link( fs::copy(
&self.snapshot_status_cache_path, &self.snapshot_status_cache_path,
&new_slot_hardlink_dir.join(SNAPSHOT_STATUS_CACHE_FILE_NAME), &new_slot_hardlink_dir.join(SNAPSHOT_STATUS_CACHE_FILE_NAME),
)?; )?;
@ -79,7 +79,7 @@ pub fn package_snapshot<P: AsRef<Path>, Q: AsRef<Path>>(
// Any errors from this point on will cause the above SnapshotPackage to drop, clearing // Any errors from this point on will cause the above SnapshotPackage to drop, clearing
// any temporary state created for the SnapshotPackage (like the snapshot_hard_links_dir) // any temporary state created for the SnapshotPackage (like the snapshot_hard_links_dir)
for files in snapshot_files { for files in snapshot_files {
files.hardlink_snapshot_directory(snapshot_hard_links_dir.path())?; files.copy_snapshot_directory(snapshot_hard_links_dir.path())?;
} }
let package = SnapshotPackage::new( let package = SnapshotPackage::new(