From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] server/worker_task: fix upid_read_status
Date: Mon, 7 Sep 2020 14:50:01 +0200 [thread overview]
Message-ID: <20200907125001.6313-1-d.csapak@proxmox.com> (raw)
a range from high to low in rust results in an empty range
(see std::ops::Range documentation)
so we need to generate the range from 0..data.len() and then reverse it
also, the task log contains a newline at the end, so we have to remove
that (should it exist)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
maybe it would be nicer (but slower) to use the .lines() iterator?
to not run into such things?
src/server/worker_task.rs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs
index 997c2492..28e62ba2 100644
--- a/src/server/worker_task.rs
+++ b/src/server/worker_task.rs
@@ -210,9 +210,14 @@ pub fn upid_read_status(upid: &UPID) -> Result<TaskState, Error> {
let mut data = Vec::with_capacity(8192);
file.read_to_end(&mut data)?;
+ // task logs should end with newline, we do not want it here
+ if data[data.len()-1] == b'\n' {
+ data.pop();
+ }
+
let last_line = {
let mut start = 0;
- for pos in data.len()-1..=0 {
+ for pos in (0..data.len()).rev() {
if data[pos] == b'\n' {
start = pos + 1;
break;
--
2.20.1
next reply other threads:[~2020-09-07 12:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 12:50 Dominik Csapak [this message]
2020-09-08 5:08 ` [pbs-devel] applied: " 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=20200907125001.6313-1-d.csapak@proxmox.com \
--to=d.csapak@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