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

src/backup/datastore.rs: pass WorkerTask to GC 

So that we can log to the task log file.
This commit is contained in:
Dietmar Maurer 2019-04-06 17:57:38 +02:00
parent 35950380a9
commit d4b59ae0b8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api2/admin/datastore.rs
View File

@ -301,7 +301,7 @@ fn start_garbage_collection(
"garbage_collection", Some(store.clone()), "root@pam", to_stdout, move |worker| "garbage_collection", Some(store.clone()), "root@pam", to_stdout, move |worker|
{ {
worker.log(format!("starting garbage collection on store {}", store)); worker.log(format!("starting garbage collection on store {}", store));
datastore.garbage_collection() datastore.garbage_collection(worker)
})?; })?;
Ok(json!(upid_str)) Ok(json!(upid_str))

17
src/backup/datastore.rs
View File

@ -13,6 +13,7 @@ use super::fixed_index::*;
use super::dynamic_index::*; use super::dynamic_index::*;
use super::index::*; use super::index::*;
use super::backup_info::*; use super::backup_info::*;
use crate::server::WorkerTask;
lazy_static!{ lazy_static!{
static ref DATASTORE_MAP: Mutex<HashMap<String, Arc<DataStore>>> = Mutex::new(HashMap::new()); static ref DATASTORE_MAP: Mutex<HashMap<String, Arc<DataStore>>> = Mutex::new(HashMap::new());
@ -226,7 +227,7 @@ impl DataStore {
Ok(()) Ok(())
} }
pub fn garbage_collection(&self) -> Result<(), Error> { pub fn garbage_collection(&self, worker: Arc<WorkerTask>) -> Result<(), Error> {
if let Ok(ref mut _mutex) = self.gc_mutex.try_lock() { if let Ok(ref mut _mutex) = self.gc_mutex.try_lock() {
@ -237,20 +238,20 @@ impl DataStore {
let mut gc_status = GarbageCollectionStatus::default(); let mut gc_status = GarbageCollectionStatus::default();
gc_status.used_bytes = 0; gc_status.used_bytes = 0;
println!("Start GC phase1 (mark chunks)"); worker.log("Start GC phase1 (mark chunks)");
self.mark_used_chunks(&mut gc_status)?; self.mark_used_chunks(&mut gc_status)?;
println!("Start GC phase2 (sweep unused chunks)"); worker.log("Start GC phase2 (sweep unused chunks)");
self.chunk_store.sweep_unused_chunks(oldest_writer, &mut gc_status)?; self.chunk_store.sweep_unused_chunks(oldest_writer, &mut gc_status)?;
println!("Used bytes: {}", gc_status.used_bytes); worker.log(&format!("Used bytes: {}", gc_status.used_bytes));
println!("Used chunks: {}", gc_status.used_chunks); worker.log(&format!("Used chunks: {}", gc_status.used_chunks));
println!("Disk bytes: {}", gc_status.disk_bytes); worker.log(&format!("Disk bytes: {}", gc_status.disk_bytes));
println!("Disk chunks: {}", gc_status.disk_chunks); worker.log(&format!("Disk chunks: {}", gc_status.disk_chunks));
} else { } else {
println!("Start GC failed - (already running/locked)"); bail!("Start GC failed - (already running/locked)");
} }
Ok(()) Ok(())