From a2b13429967ae40ee444f67f5c68f4e084eab930 Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Tue, 5 Mar 2019 09:30:57 +0100 Subject: [PATCH] rgw: drop entries only if the markers do not match. Signed-off-by: Abhishek Lekshmanan (cherry picked from commit 3a5647f748185e3a3fc2602a132874c0dfb24368) --- src/rgw/rgw_lc.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc index 8abb73a27a91d..268faf053ec7f 100644 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@ -952,16 +952,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) { ldpp_dout(this, 0) << "LC:get_bucket_info for " << bucket_name << " failed" << dendl; return ret; } - ret = bucket_info.bucket.bucket_id.compare(bucket_id) ; - if (ret != 0) { - ldpp_dout(this, 0) << "LC:old bucket id found. " << bucket_name << " should be deleted" << dendl; + if (bucket_info.bucket.marker != bucket_marker) { + ldpp_dout(this, 1) << "LC: deleting stale entry found for bucket=" << bucket_tenant + << ":" << bucket_name << " cur_marker=" << bucket_info.bucket.marker + << " orig_marker=" << bucket_marker << dendl; return -ENOENT; } -- 2.39.5