tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

datastore: clippy fixes

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-05-25 18:01:23 +02:00
parent abd8248520
commit bc001e12e2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pbs-datastore/src/datastore.rs
View File

@ -470,7 +470,7 @@ impl DataStore {
.recursive_iter_backup_ns(ns.to_owned())? .recursive_iter_backup_ns(ns.to_owned())?
.collect::<Result<Vec<BackupNamespace>, Error>>()?; .collect::<Result<Vec<BackupNamespace>, Error>>()?;
children.sort_by(|a, b| b.depth().cmp(&a.depth())); children.sort_by_key(|b| std::cmp::Reverse(b.depth()));
let base_file = std::fs::File::open(self.base_path())?; let base_file = std::fs::File::open(self.base_path())?;
let base_fd = base_file.as_raw_fd(); let base_fd = base_file.as_raw_fd();
@ -982,8 +982,10 @@ impl DataStore {
.oldest_writer() .oldest_writer()
.unwrap_or(phase1_start_time); .unwrap_or(phase1_start_time);
let mut gc_status = GarbageCollectionStatus::default(); let mut gc_status = GarbageCollectionStatus {
gc_status.upid = Some(upid.to_string()); upid: Some(upid.to_string()),
..Default::default()
};
task_log!(worker, "Start GC phase1 (mark used chunks)"); task_log!(worker, "Start GC phase1 (mark used chunks)");
@ -1140,8 +1142,8 @@ impl DataStore {
self.inner.verify_new self.inner.verify_new
} }
/// returns a list of chunks sorted by their inode number on disk /// returns a list of chunks sorted by their inode number on disk chunks that couldn't get
/// chunks that could not be stat'ed are at the end of the list /// stat'ed are placed at the end of the list
pub fn get_chunks_in_order<F, A>( pub fn get_chunks_in_order<F, A>(
&self, &self,
index: &Box<dyn IndexFile + Send>, index: &Box<dyn IndexFile + Send>,

3
pbs-datastore/src/snapshot_reader.rs
View File

@ -60,8 +60,7 @@ impl SnapshotReader {
let mut client_log_path = snapshot_path; let mut client_log_path = snapshot_path;
client_log_path.push(CLIENT_LOG_BLOB_NAME); client_log_path.push(CLIENT_LOG_BLOB_NAME);
let mut file_list = Vec::new(); let mut file_list = vec![MANIFEST_BLOB_NAME.to_string()];
file_list.push(MANIFEST_BLOB_NAME.to_string());
for item in manifest.files() { for item in manifest.files() {
file_list.push(item.filename.clone()); file_list.push(item.filename.clone());
} }