* [pbs-devel] [PATCH proxmox v3 1/2] fix #5946: rest-server: worker_task: detect task status on multi-line message
2025-09-29 9:52 [pbs-devel] [PATCH proxmox v3 0/2] fix #5946: rest-server: worker_task: detect task status on multi-line message Filip Schauer
@ 2025-09-29 9:52 ` Filip Schauer
2025-09-29 9:52 ` [pbs-devel] [PATCH proxmox v3 2/2] rest-server: add tests for upid_read_status Filip Schauer
2025-10-03 19:08 ` [pbs-devel] applied: [PATCH proxmox v3 0/2] fix #5946: rest-server: worker_task: detect task status on multi-line message Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Filip Schauer @ 2025-09-29 9:52 UTC (permalink / raw)
To: pbs-devel
Properly detect the status of a task when the last log message spans
over multiple lines.
This fixes task status detection in Proxmox Backup Server when the
directory creation task fails during creation of the partition on disk.
With this fix the status becomes:
TaskState::Error { message: "command "sgdisk" "-n1" "-t1:8300"
"/dev/sdc" failed - status code: 2 - Caution: invalid main GPT header,
but valid backup; regenerating main header" }
instead of TaskState::Unknown.
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
proxmox-rest-server/src/worker_task.rs | 35 +++++++++++---------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index a3a65add..c9ae5243 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -464,29 +464,22 @@ pub fn upid_read_status(upid: &UPID) -> Result<TaskState, Error> {
data.pop();
}
- let last_line = match data.iter().rposition(|c| *c == b'\n') {
- Some(start) if data.len() > (start + 1) => &data[start + 1..],
- Some(_) => &data, // should not happen, since we removed all trailing newlines
- None => &data,
- };
-
- let last_line = std::str::from_utf8(last_line)
- .map_err(|err| format_err!("upid_read_status: utf8 parse failed: {}", err))?;
-
- let mut endtime = upid.starttime; // as fallback
- let mut iter = last_line.splitn(2, ": ");
- if let Some(time_str) = iter.next() {
- if let Ok(parsed_endtime) = proxmox_time::parse_rfc3339(time_str) {
- endtime = parsed_endtime; // save last found time for when the state cannot be parsed
- if let Some(rest) = iter.next().and_then(|rest| rest.strip_prefix("TASK ")) {
- if let Ok(state) = TaskState::from_endtime_and_message(parsed_endtime, rest) {
- return Ok(state);
- }
- }
+ let state = data.rsplit(|&c| c == b'\n').find_map(|line| {
+ let line_str = std::str::from_utf8(line).ok()?;
+ let mut parts = line_str.splitn(2, ": ");
+ let time_str = parts.next()?;
+ let endtime = proxmox_time::parse_rfc3339(time_str).ok()?;
+ if let Some(rest) = parts.next().and_then(|rest| rest.strip_prefix("TASK ")) {
+ Some(TaskState::from_endtime_and_message(endtime, rest).ok()?)
+ } else {
+ // no last line with both, end-time and task-state, found.
+ Some(TaskState::Unknown { endtime })
}
- }
+ });
- Ok(TaskState::Unknown { endtime }) // no last line with both, end-time and task-state, found.
+ Ok(state.unwrap_or(TaskState::Unknown {
+ endtime: upid.starttime,
+ }))
}
static WORKER_TASK_LIST: LazyLock<Mutex<HashMap<usize, Arc<WorkerTask>>>> =
--
2.47.3
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 4+ messages in thread* [pbs-devel] [PATCH proxmox v3 2/2] rest-server: add tests for upid_read_status
2025-09-29 9:52 [pbs-devel] [PATCH proxmox v3 0/2] fix #5946: rest-server: worker_task: detect task status on multi-line message Filip Schauer
2025-09-29 9:52 ` [pbs-devel] [PATCH proxmox v3 1/2] " Filip Schauer
@ 2025-09-29 9:52 ` Filip Schauer
2025-10-03 19:08 ` [pbs-devel] applied: [PATCH proxmox v3 0/2] fix #5946: rest-server: worker_task: detect task status on multi-line message Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Filip Schauer @ 2025-09-29 9:52 UTC (permalink / raw)
To: pbs-devel
Test that the task state is correctly extracted from a task log.
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
proxmox-rest-server/tests/worker_task.rs | 65 ++++++++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 proxmox-rest-server/tests/worker_task.rs
diff --git a/proxmox-rest-server/tests/worker_task.rs b/proxmox-rest-server/tests/worker_task.rs
new file mode 100644
index 00000000..c2afc463
--- /dev/null
+++ b/proxmox-rest-server/tests/worker_task.rs
@@ -0,0 +1,65 @@
+use std::fs::{remove_dir_all, write};
+
+use proxmox_rest_server::{
+ init_worker_tasks, upid_log_path, upid_read_status, TaskState, WorkerTask,
+};
+use proxmox_sys::fs::{make_tmp_dir, CreateOptions};
+
+fn upid_read_status_test_helper(log: &str, expected: &TaskState) {
+ let task = WorkerTask::new("x", None, "u@pam".into(), false).unwrap().0;
+ let upid = task.upid();
+ let logfile = upid_log_path(upid).unwrap();
+ write(logfile, log).unwrap();
+
+ let status = upid_read_status(upid).unwrap();
+
+ assert!(&status == expected);
+}
+
+#[tokio::test]
+async fn test_upid_read_status() {
+ let tmpdir = make_tmp_dir("/tmp/", None).unwrap();
+ init_worker_tasks(tmpdir.clone(), CreateOptions::new()).unwrap();
+
+ upid_read_status_test_helper(
+ "2025-09-22T14:31:04+02:00: The quick, brown fox jumps over a lazy dog.\n\
+ 2025-09-22T14:31:04+02:00: TASK ERROR: Something went wrong",
+ &TaskState::Error {
+ message: "Something went wrong".into(),
+ endtime: 1758544264,
+ },
+ );
+
+ upid_read_status_test_helper(
+ "1970-01-01T01:00:00+01:00: The quick, brown fox jumps over a lazy dog.\n\
+ 1970-01-01T01:00:01+01:00: TASK ERROR: Lorem ipsum dolor sit amet\n\
+ consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt\n\
+ ut labore et dolore magna aliquyam erat, sed diam voluptua.",
+ &TaskState::Error {
+ message: "Lorem ipsum dolor sit amet".into(),
+ endtime: 1,
+ },
+ );
+
+ upid_read_status_test_helper(
+ "2025-09-24T10:56:12+02:00: Lorem ipsum dolor sit amet\n\
+ 2025-09-24T10:56:13+02:00: consetetur sadipscing elitr\n\
+ 2025-09-24T10:56:14+02:00: TASK OK",
+ &TaskState::OK {
+ endtime: 1758704174,
+ },
+ );
+
+ upid_read_status_test_helper(
+ "2025-09-23T12:07:49+02:00: Warning 1\n\
+ 2025-09-23T12:29:11+02:00: Warning 2\n\
+ 2025-09-23T12:29:11+02:00: TASK WARNINGS: 2",
+ &TaskState::Warning {
+ count: 2,
+ endtime: 1758623351,
+ },
+ );
+
+ // Cleanup
+ remove_dir_all(tmpdir).unwrap();
+}
--
2.47.3
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 4+ messages in thread