From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 5 Mar 2019 08:30:57 +0000 (+0100)
Subject: rgw: drop entries only if the markers do not match.
X-Git-Tag: v12.2.13~40^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3165c6041d63abf442f2d1a1e190b8f5091f2f09;p=ceph.git

rgw: drop entries only if the markers do not match.

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

Conflicts:
    src/rgw/rgw_lc.cc
- rgw_lc.cc has changed much since luminous
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index f98eabc0486b..0dcfc592435f 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -347,16 +347,17 @@ int RGWLC::bucket_lc_process(string& shard_id)
   boost::split(result, shard_id, boost::is_any_of(":"));
   string bucket_tenant = result[0];
   string bucket_name = result[1];
-  string bucket_id = result[2];
+  string bucket_marker = result[2];
   int ret = store->get_bucket_info(obj_ctx, bucket_tenant, bucket_name, bucket_info, NULL, &bucket_attrs);
   if (ret < 0) {
     ldout(cct, 0) << "LC:get_bucket_info failed" << bucket_name <<dendl;
     return ret;
   }
 
-  ret = bucket_info.bucket.bucket_id.compare(bucket_id) ;
-  if (ret !=0) {
-    ldout(cct, 0) << "LC:old bucket id find, should be delete" << bucket_name <<dendl;
+  if (bucket_info.bucket.marker != bucket_marker) {
+    ldout(cct, 0) << "LC: deleting stale entry found for bucket=" << bucket_tenant
+                       << ":" << bucket_name << " cur_marker=" << bucket_info.bucket.marker
+                       << " orig_marker=" << bucket_marker << dendl;
     return -ENOENT;
   }