[pbs-devel] [PATCH proxmox-backup v2] datastore: fix problem with operations counting

[pbs-devel] [PATCH proxmox-backup v2] datastore: fix problem with operations counting

[Hannes Laimer]

... if `.chunks/` is not available(deleted/moved) ChunkStore::open
fails, but that would happen after updating the active operations on the
datastore, so no reference that could be dropped is returned. Leading to
the operations counter to always increase. This only updates the counter
when a reference is returned, not before.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 pbs-datastore/src/datastore.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index f95da761..5e2208bc 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -158,13 +158,6 @@ impl DataStore {
             }
         }
 
-        if let Some(operation) = operation {
-            update_active_operations(name, operation, 1)?;
-        }
-
-        // Our operation is registered, unlock the config.
-        drop(config_lock);
-
         let mut datastore_cache = DATASTORE_MAP.lock().unwrap();
         let entry = datastore_cache.get(name);
 
@@ -172,6 +165,9 @@ impl DataStore {
         let chunk_store = if let Some(datastore) = &entry {
             let last_digest = datastore.last_digest.as_ref();
             if let Some(true) = last_digest.map(|last_digest| last_digest == &digest) {
+                if let Some(operation) = operation {
+                    update_active_operations(name, operation, 1)?;
+                }
                 return Ok(Arc::new(Self {
                     inner: Arc::clone(datastore),
                     operation,
@@ -195,6 +191,10 @@ impl DataStore {
         let datastore = Arc::new(datastore);
         datastore_cache.insert(name.to_string(), datastore.clone());
 
+        if let Some(operation) = operation {
+            update_active_operations(name, operation, 1)?;
+        }
+
         Ok(Arc::new(Self {
             inner: datastore,
             operation,
-- 
2.39.2



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

[pbs-devel] applied: [PATCH proxmox-backup v2] datastore: fix problem with operations counting

[Fabian Grünbichler]

On April 25, 2024 11:01 am, Hannes Laimer wrote:
> ... if `.chunks/` is not available(deleted/moved) ChunkStore::open
> fails, but that would happen after updating the active operations on the
> datastore, so no reference that could be dropped is returned. Leading to
> the operations counter to always increase. This only updates the counter
> when a reference is returned, not before.
> 
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  pbs-datastore/src/datastore.rs | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index f95da761..5e2208bc 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -158,13 +158,6 @@ impl DataStore {
>              }
>          }
>  
> -        if let Some(operation) = operation {
> -            update_active_operations(name, operation, 1)?;
> -        }
> -
> -        // Our operation is registered, unlock the config.
> -        drop(config_lock);
> -
>          let mut datastore_cache = DATASTORE_MAP.lock().unwrap();
>          let entry = datastore_cache.get(name);
>  
> @@ -172,6 +165,9 @@ impl DataStore {
>          let chunk_store = if let Some(datastore) = &entry {
>              let last_digest = datastore.last_digest.as_ref();
>              if let Some(true) = last_digest.map(|last_digest| last_digest == &digest) {
> +                if let Some(operation) = operation {
> +                    update_active_operations(name, operation, 1)?;
> +                }
>                  return Ok(Arc::new(Self {
>                      inner: Arc::clone(datastore),
>                      operation,
> @@ -195,6 +191,10 @@ impl DataStore {
>          let datastore = Arc::new(datastore);
>          datastore_cache.insert(name.to_string(), datastore.clone());
>  
> +        if let Some(operation) = operation {
> +            update_active_operations(name, operation, 1)?;
> +        }
> +
>          Ok(Arc::new(Self {
>              inner: datastore,
>              operation,
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> 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