rgw: make object removal atomic in rgw-object-expirer.

Fixes: #4099
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 5f29afcb14deb4212a6c26108584969081dc09ab..97b5a27e58d736b707b2cb8ae66d5a66ae4c0e37 100644 (file)
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -81,7 +81,6 @@ static int garbage_single_object(objexp_hint_entry& hint)
     return ret;
   }
 
-  /* TODO: check whether the hint is actual. */
   RGWObjectCtx rctx(store);
 
   rgw_obj_key key = hint.obj_key;
@@ -90,6 +89,7 @@ static int garbage_single_object(objexp_hint_entry& hint)
   }
 
   rgw_obj obj(bucket_info.bucket, key);
+  store->set_atomic(&rctx, obj);
   ret = store->delete_obj(rctx, bucket_info, obj,
           bucket_info.versioning_status(), 0, hint.exp_time);