From: Dietmar Maurer <dietmar@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>,
Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup] server/worker_task: fix 'unknown' status for some big task logs
Date: Fri, 4 Sep 2020 10:51:41 +0200 (CEST) [thread overview]
Message-ID: <357142033.732.1599209502454@webmail.proxmox.com> (raw)
In-Reply-To: <eea41a5a-b944-39c8-fc9b-572ecb9b3dd6@proxmox.com>
> no for two reasons:
>
> if the task log contains only one line (this happens, e.g. 'TASK OK')
> or if the last Log line is exactly 8k long (i am not sure that could happen)
>
> for the first we could check if the file is < 8k long
I committed a more optimized version:
diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs
index a9e4a36..997c249 100644
--- a/src/server/worker_task.rs
+++ b/src/server/worker_task.rs
@@ -1,6 +1,6 @@
use std::collections::HashMap;
use std::fs::File;
-use std::io::{BufRead, BufReader};
+use std::io::{Read, BufRead, BufReader};
use std::panic::UnwindSafe;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex};
@@ -195,8 +195,8 @@ pub fn create_task_log_dirs() -> Result<(), Error> {
/// If there is not a single line with at valid datetime, we assume the
/// starttime to be the endtime
pub fn upid_read_status(upid: &UPID) -> Result<TaskState, Error> {
- let mut endtime = upid.starttime;
- let mut status = TaskState::Unknown { endtime };
+
+ let mut status = TaskState::Unknown { endtime: upid.starttime };
let path = upid.log_path();
@@ -207,22 +207,29 @@ pub fn upid_read_status(upid: &UPID) -> Result<TaskState, Error> {
use std::io::SeekFrom;
let _ = file.seek(SeekFrom::End(-8192)); // ignore errors
- let reader = BufReader::new(file);
-
- for line in reader.lines() {
- let line = line?;
+ let mut data = Vec::with_capacity(8192);
+ file.read_to_end(&mut data)?;
- let mut iter = line.splitn(2, ": ");
- if let Some(time_str) = iter.next() {
- endtime = chrono::DateTime::parse_from_rfc3339(time_str)
- .map_err(|err| format_err!("cannot parse '{}': {}", time_str, err))?
- .timestamp();
- } else {
- continue;
+ let last_line = {
+ let mut start = 0;
+ for pos in data.len()-1..=0 {
+ if data[pos] == b'\n' {
+ start = pos + 1;
+ break;
+ }
}
- match iter.next().and_then(|rest| rest.strip_prefix("TASK ")) {
- None => continue,
- Some(rest) => {
+ &data[start..]
+ };
+
+ let last_line = std::str::from_utf8(last_line)
+ .map_err(|err| format_err!("upid_read_status: utf8 parse failed: {}", err))?;
+
+ let mut iter = last_line.splitn(2, ": ");
+ if let Some(time_str) = iter.next() {
+ if let Ok(endtime) = chrono::DateTime::parse_from_rfc3339(time_str) {
+ let endtime = endtime.timestamp();
+
+ if let Some(rest) = iter.next().and_then(|rest| rest.strip_prefix("TASK ")) {
if let Ok(state) = TaskState::from_endtime_and_message(endtime, rest) {
status = state;
}
prev parent reply other threads:[~2020-09-04 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 9:39 Dominik Csapak
2020-09-03 10:36 ` Dietmar Maurer
2020-09-03 10:46 ` Dominik Csapak
2020-09-04 8:51 ` Dietmar Maurer [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=357142033.732.1599209502454@webmail.proxmox.com \
--to=dietmar@proxmox.com \
--cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.