From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Mon, 21 Jun 2021 17:32:08 +0000 (+0300)
Subject: rgw/notification: make notifications agnostic of bucket reshard
X-Git-Tag: v16.2.7~114^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d59fe5c12d9e893179cb1c840120fbf50ca8b88d;p=ceph.git

rgw/notification: make notifications agnostic of bucket reshard

Fixes: https://tracker.ceph.com/issues/51293

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit 201942f2d4c8f2c21b49619f77cbb7c8693447e8)
---

diff --git a/src/rgw/rgw_pubsub.h b/src/rgw/rgw_pubsub.h
index b82384e64ec..958fb9ce2e2 100644
--- a/src/rgw/rgw_pubsub.h
+++ b/src/rgw/rgw_pubsub.h
@@ -603,7 +603,7 @@ class RGWPubSub
   }
 
   std::string bucket_meta_oid(const rgw_bucket& bucket) const {
-    return pubsub_oid_prefix + tenant + ".bucket." + bucket.name + "/" + bucket.bucket_id;
+    return pubsub_oid_prefix + tenant + ".bucket." + bucket.name + "/" + bucket.marker;
   }
 
   std::string sub_meta_oid(const string& name) const {