From: Shilpa Jagannath <smanjara@redhat.com>
Date: Wed, 28 Aug 2024 00:41:25 +0000 (-0400)
Subject: rgw/multiiste: fix bucket enotempty check
X-Git-Tag: v20.3.0~161^2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd16d5a19cf8a7b9cb9dd054a79964f1f5c1f8fd;p=ceph.git

rgw/multiiste: fix bucket enotempty check

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
index 1941a1b4e3174..d7fd7ae29c452 100644
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@ -5650,14 +5650,8 @@ int list_remote_buckets(const DoutPrefixProvider *dpp,
   }
 
   for (const auto& list_result: peer_status) {
-    auto entries_iter = list_result.entries.begin();
-    for (; entries_iter != list_result.entries.end(); ++entries_iter) {
-      std::string ns;
-      rgw_obj_key obj;
-
-      if (rgw_obj_key::oid_to_key_in_ns(entries_iter->key.name, &obj, ns)) {
-        return -ENOTEMPTY;
-      }
+    if (!list_result.entries.empty()) {
+      return -ENOTEMPTY;
     }
   }
   return 0;