From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] fix division by zero
Date: Thu, 23 Jul 2020 16:16:37 +0000 [thread overview]
Message-ID: <20200723161637.6280-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20200723161637.6280-1-s.ivanov@proxmox.com>
in case the backup duration gets rounded to 0 seconds
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/client/backup_writer.rs | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/client/backup_writer.rs b/src/client/backup_writer.rs
index 7e5adb3c..c2db2e76 100644
--- a/src/client/backup_writer.rs
+++ b/src/client/backup_writer.rs
@@ -264,9 +264,14 @@ impl BackupWriter {
crate::tools::format::strip_server_file_expenstion(archive_name.clone())
};
if archive_name != CATALOG_NAME {
- let speed: HumanByte = (uploaded / (duration.as_secs() as usize)).into();
- let uploaded: HumanByte = uploaded.into();
- println!("{}: had to upload {} from {} in {}s, avgerage speed {}/s).", archive, uploaded, vsize_h, duration.as_secs(), speed);
+ let hb_uploaded: HumanByte = uploaded.into();
+ match duration.as_secs() {
+ 0 => println!("{}: had to upload {} from {} in {}s", archive, hb_uploaded, vsize_h, duration.as_secs()),
+ dur => {
+ let speed: HumanByte = (uploaded / (dur as usize)).into();
+ println!("{}: had to upload {} from {} in {}s, (average speed {}/s).", archive, hb_uploaded, vsize_h, duration.as_secs(), speed);
+ }
+ }
} else {
println!("Uploaded backup catalog ({})", vsize_h);
}
--
2.20.1
next prev parent reply other threads:[~2020-07-23 16:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 16:16 [pbs-devel] [PATCH proxmox-backup 0/2] fix 2885 and a " Stoiko Ivanov
2020-07-23 16:16 ` [pbs-devel] [PATCH proxmox-backup 1/2] fix 2885: bail on duplicate backup target Stoiko Ivanov
2020-07-24 9:12 ` [pbs-devel] applied: " Thomas Lamprecht
2020-07-23 16:16 ` Stoiko Ivanov [this message]
2020-07-24 5:52 ` [pbs-devel] [PATCH proxmox-backup 2/2] fix division by zero Fabian Grünbichler
2020-07-24 7:15 ` Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723161637.6280-3-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox