Merge pull request aquarist-labs#235 from jecluis/wip-fix-656

rgw/sfs: delete multiparts only on existing buckets
giubacc · Oct 24, 2023 · 4976c75 · 4976c75
2 parents 7744b04 + a7a55bf
commit 4976c75
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/rgw/driver/sfs/sqlite/sqlite_multipart.cc b/src/rgw/driver/sfs/sqlite/sqlite_multipart.cc
@@ -112,7 +112,11 @@ int SQLiteMultipart::abort_multiparts_by_bucket_id(const std::string& bucket_id
 int SQLiteMultipart::abort_multiparts(const std::string& bucket_name) const {
   auto storage = conn->get_storage();
   auto bucket_ids_vec = storage.select(
-      &DBBucket::bucket_id, where(is_equal(&DBBucket::bucket_name, bucket_name))
+      &DBBucket::bucket_id,
+      where(
+          is_equal(&DBBucket::bucket_name, bucket_name) and
+          is_equal(&DBBucket::deleted, false)
+      )
   );
   if (bucket_ids_vec.size() == 0) {
     return -ERR_NO_SUCH_BUCKET;