proxmox-mirrors/proxmox-backup-qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-backup-qemu synced 2025-10-05 09:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

deduplicate 'not connected' error cases

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-08-13 10:10:05 +02:00
parent bbb2d9774b
commit 78552edbec
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/backup.rs
View File

@ -135,6 +135,13 @@ impl BackupTask {
abortable_command(command_future, abort_rx.recv()).await abortable_command(command_future, abort_rx.recv()).await
} }
fn need_writer(&self) -> Result<Arc<BackupWriter>, Error> {
self.writer
.get()
.map(Arc::clone)
.ok_or_else(|| format_err!("not connected"))
}
pub async fn add_config( pub async fn add_config(
&self, &self,
name: String, name: String,
@ -143,13 +150,8 @@ impl BackupTask {
self.check_aborted()?; self.check_aborted()?;
let writer = match self.writer.get() {
Some(writer) => Arc::clone(writer),
None => bail!("not connected"),
};
let command_future = add_config( let command_future = add_config(
writer, self.need_writer()?,
Arc::clone(&self.manifest), Arc::clone(&self.manifest),
name, name,
data, data,
@ -171,13 +173,8 @@ impl BackupTask {
self.check_aborted()?; self.check_aborted()?;
let writer = match self.writer.get() {
Some(writer) => Arc::clone(writer),
None => bail!("not connected"),
};
let command_future = write_data( let command_future = write_data(
writer, self.need_writer()?,
if self.crypt_mode == CryptMode::Encrypt { self.crypt_config.clone() } else { None }, if self.crypt_mode == CryptMode::Encrypt { self.crypt_config.clone() } else { None },
Arc::clone(&self.registry), Arc::clone(&self.registry),
Arc::clone(&self.known_chunks), Arc::clone(&self.known_chunks),
@ -220,13 +217,8 @@ impl BackupTask {
self.check_aborted()?; self.check_aborted()?;
let writer = match self.writer.get() {
Some(writer) => Arc::clone(writer),
None => bail!("not connected"),
};
let command_future = register_image( let command_future = register_image(
writer, self.need_writer()?,
self.crypt_config.clone(), self.crypt_config.clone(),
self.crypt_mode, self.crypt_mode,
self.last_manifest.get().map(Arc::clone), self.last_manifest.get().map(Arc::clone),
@ -246,13 +238,8 @@ impl BackupTask {
self.check_aborted()?; self.check_aborted()?;
let writer = match self.writer.get() {
Some(writer) => Arc::clone(writer),
None => bail!("not connected"),
};
let command_future = close_image( let command_future = close_image(
writer, self.need_writer()?,
Arc::clone(&self.manifest), Arc::clone(&self.manifest),
Arc::clone(&self.registry), Arc::clone(&self.registry),
dev_id, dev_id,
@ -267,13 +254,8 @@ impl BackupTask {
self.check_aborted()?; self.check_aborted()?;
let writer = match self.writer.get() {
Some(writer) => Arc::clone(writer),
None => bail!("not connected"),
};
let command_future = finish_backup( let command_future = finish_backup(
writer, self.need_writer()?,
self.crypt_config.clone(), self.crypt_config.clone(),
Arc::clone(&self.manifest), Arc::clone(&self.manifest),
); );