[pbs-devel] [PATCH FOLLOW-UP proxmox-backup 2/4] task tracking: actually reset entry if desynced

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

and warn about it. this *should* never happen unless the tracking file got
somehow messed with manually..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
This one fixes the replied-to patch to also correctly store an entry with no
tasks for the current PID, instead of just returning that there are none..

I am actually not sure how we should handle such a desync, we now pretend it's
the last task even though we don't know for sure.. maybe we should just error
out and let the Drop handler (not) handle it?

 pbs-datastore/src/task_tracking.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pbs-datastore/src/task_tracking.rs b/pbs-datastore/src/task_tracking.rs
index 10afebbe2..755d88fdf 100644
--- a/pbs-datastore/src/task_tracking.rs
+++ b/pbs-datastore/src/task_tracking.rs
@@ -94,7 +94,7 @@ pub fn get_active_operations_locked(
 pub fn update_active_operations(
     name: &str,
     operation: Operation,
-    count: i64,
+    mut count: i64,
 ) -> Result<ActiveOperationStats, Error> {
     let path = PathBuf::from(format!("{}/{}", crate::ACTIVE_OPERATIONS_DIR, name));
 
@@ -131,7 +131,15 @@ pub fn update_active_operations(
         None => Vec::new(),
     };
 
-    if !found_entry && count > 0 {
+    if !found_entry {
+        if count < 0 {
+            // if we don't have any operations at the moment, decrementing is not possible..
+            log::warn!(
+                "Active operations tracking mismatch - no current entry for {pid} but asked
+to decrement by {count}!"
+            );
+            count = 0;
+        };
         match operation {
             Operation::Read => updated_active_operations.read = count,
             Operation::Write => updated_active_operations.write = count,
-- 
2.47.3



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel