From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup] server/worker_task: remove all trailing newlines when reading task status
Date: Mon, 25 Jan 2021 11:49:04 +0100 [thread overview]
Message-ID: <2df46a44-252f-f1f7-6642-14acc7fad372@proxmox.com> (raw)
In-Reply-To: <1611570722.leevyf14px.astroid@nora.none>
On 1/25/21 11:37 AM, Fabian Grünbichler wrote:
> On January 25, 2021 10:29 am, Dominik Csapak wrote:
>> sometimes we may write multiple newlines at the end of tasks,
>> for example if an error message contains multiple newlines itself
>>
>> simply ignore all newlines at the end of task logs instead of only one
>>
>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>> ---
>> it happened to me during tape cleaning testing, a permission denied
>> error had two newlines at the end, and i did not find the source of
>> them... anyway i think we should ignore all of them
>>
>> src/server/worker_task.rs | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs
>> index 967814c9..a4b2a35f 100644
>> --- a/src/server/worker_task.rs
>> +++ b/src/server/worker_task.rs
>> @@ -191,7 +191,7 @@ pub fn upid_read_status(upid: &UPID) -> Result<TaskState, Error> {
>> file.read_to_end(&mut data)?;
>>
>> // task logs should end with newline, we do not want it here
>> - if !data.is_empty() && data[data.len()-1] == b'\n' {
>> + while !data.is_empty() && data[data.len()-1] == b'\n' {
>
> while data.last() == Some(&b'\n') {
>
> (same assembly, no potential to introduce off-by-one in the future?)
>
yeah sounds right, the change from if to while was too obvious
did not think about how to do it better altogether ;)
>> data.pop();
>> }
>>
>> --
>> 2.20.1
>>
>>
>>
>> _______________________________________________
>> pbs-devel mailing list
>> pbs-devel@lists.proxmox.com
>> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>>
>>
>>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
prev parent reply other threads:[~2021-01-25 10:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 9:29 Dominik Csapak
2021-01-25 10:37 ` Fabian Grünbichler
2021-01-25 10:49 ` Dominik Csapak [this message]
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=2df46a44-252f-f1f7-6642-14acc7fad372@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