rgw: no need to RGWReshard::get before remove

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 2a68224aa4381d9d7d0285fac278dcead953fa3a)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index a8e68c1dd1b70db9a6de2d1afdfa6e6fc9fc60fc..9fb36395e68b07b676b94a2a7de2db9b786b1082 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -5796,17 +5796,10 @@ next:
     entry.bucket_name = bucket_name;
     //entry.bucket_id = bucket_id;
 
-    ret = reshard.get(entry);
+    ret = reshard.remove(entry);
     if (ret < 0 && ret != -ENOENT) {
       cerr << "Error in getting bucket " << bucket_name << ": " << cpp_strerror(-ret) << std::endl;
       return ret;
-    } else if (ret != -ENOENT) {
-      ret = reshard.remove(entry);
-      if (ret < 0) {
-       cerr << "Error removing bucket " << bucket_name << " from resharding queue: " << cpp_strerror(-ret) <<
-         std::endl;
-       return ret;
-      }
     }
   }
 

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index e3c7984bad2810998a3eb5e7661b4ea66194693a..03c1fb92e09b46606d4e8215c18ecc3bd9fa53e7 100644 (file)
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -677,7 +677,10 @@ int RGWReshard::get(cls_rgw_reshard_entry& entry)
 
   int ret = cls_rgw_reshard_get(store->reshard_pool_ctx, logshard_oid, entry);
   if (ret < 0) {
-    lderr(store->ctx()) << "ERROR: failed to get entry from reshard log, oid=" << logshard_oid << " tenant=" << entry.tenant << " bucket=" << entry.bucket_name << dendl;
+    if (ret != -ENOENT) {
+      lderr(store->ctx()) << "ERROR: failed to get entry from reshard log, oid=" << logshard_oid << " tenant=" << entry.tenant <<
+       " bucket=" << entry.bucket_name << dendl;
+    }
     return ret;
   }