james/zfsbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add pluggable progressors

Browse Source
This commit is contained in:
James McDonald
2026-04-26 14:51:22 +02:00
parent c2ccccc88f
commit ce81e266b7
6 changed files with 182 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/job.rs
View File

@@ -181,6 +181,7 @@ impl Job {
source: &str,
dest: &str,
inc_snapshot: Option<&str>,
total: Option<u64>,
) -> Result<(), String> {
let mut send_cmd = self.get_side_command(JobSide::Source);
send_cmd.push("send");
@@ -191,7 +192,7 @@ impl Job {
let mut receive_cmd = self.get_side_command(JobSide::Destination);
receive_cmd.extend(["receive", "-F", dest]);
command::exec_piped_commands(&send_cmd, &receive_cmd, self.sender.clone())?;
command::exec_piped_commands(&send_cmd, &receive_cmd, self.sender.clone(), total)?;
self.send_event(BackupEvent::DatasetCompleted(source.to_string()));
Ok(())
}
@@ -313,8 +314,16 @@ impl Job {
);
let snapshot = self.create_snapshot(source, JobSide::Source)?;
self.estimate(&snapshot, Some(&inc_snapshot)).ok();
self.send_receive(&snapshot, &dest, Some(&inc_snapshot))?;
let total = self.estimate(&snapshot, Some(&inc_snapshot)).ok();
if self.dryrun {
self.send_event(BackupEvent::DryrunCompleted(source.clone()));
self.delete_snapshot(Snapshot {
snapshot: snapshot.clone(),
side: JobSide::Source,
})?;
return Ok(());
}
self.send_receive(&snapshot, &dest, Some(&inc_snapshot), total)?;
} else {
self.send_event(BackupEvent::StartingFullBackup {
source: source.clone(),
@@ -323,8 +332,16 @@ impl Job {
total: self.datasets.len(),
});
let snapshot = self.create_snapshot(source, JobSide::Source)?;
self.estimate(&snapshot, None).ok();
self.send_receive(&snapshot, &dest, None)?;
let total = self.estimate(&snapshot, None).ok();
if self.dryrun {
self.send_event(BackupEvent::DryrunCompleted(source.clone()));
self.delete_snapshot(Snapshot {
snapshot: snapshot.clone(),
side: JobSide::Source,
})?;
return Ok(());
}
self.send_receive(&snapshot, &dest, None, total)?;
}
// Clean up snapshots