rgw lc: use marker for the shard id

Since buckets can undergo resharding which changes the bucket id, using the
bucket marker in the shard id can help prevent the need to rewrite the entry as
the buckets get resharded. This also helps detect the exit criteria when the
bucket gets deleted.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit bf64aa843febf2f09aab54f9e0a24aa44f5938ea)

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 268faf053ec7fcb3bc134be5857476b3e3481ece..2a779be0e4602ee0e01da5fac1c4ee7a127474ce 100644 (file)
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1305,7 +1305,7 @@ template<typename F>
 static int guard_lc_modify(RGWRados* store, const rgw_bucket& bucket, const string& cookie, const F& f) {
   CephContext *cct = store->ctx();
 
-  string shard_id = bucket.tenant + ':' + bucket.name + ':' + bucket.bucket_id;  
+  string shard_id = bucket.tenant + ':' + bucket.name + ':' + bucket.marker;
 
   string oid; 
   get_lc_oid(cct, shard_id, &oid);