gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-06 03:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(scanner): retain cleanup scope after cancellation

Browse Source 
Co-Authored-By: heihutu <heihutu@gmail.com>
This commit is contained in:
houseme
2026-08-30 03:10:32 +08:00
parent 52961d2726
commit 59de0de6b3
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/scanner/src/lib.rs
+18 -2
View File
@@ -773,8 +773,24 @@ where
} else {
None
};
opts.scanner_publication_commit_scope = scanner_publication_commit_scope;
let result = api.delete_config_object(bucket, object, opts).await;
let result = if let Some(scope) = scanner_publication_commit_scope {
// Keep the storage mutation and its publication scope alive after the
// scanner persistence waiter is cancelled. The delete path can fan
// out to remote RPCs or blocking local namespace syscalls; dropping
// only the waiter must not release the movement permit early.
opts.scanner_publication_commit_scope = Some(scope.clone());
let bucket = bucket.to_owned();
let object = object.to_owned();
tokio::spawn(async move {
let _publication_scope_owner = scope;
api.delete_config_object(&bucket, &object, opts).await
})
.await
.map_err(|err| EcstoreError::other(format!("scanner publication delete owner failed: {err}")))?
} else {
opts.scanner_publication_commit_scope = None;
api.delete_config_object(bucket, object, opts).await
};
drop(legacy_admission);
result
}