From 2a68224aa4381d9d7d0285fac278dcead953fa3a Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Thu, 29 Mar 2018 13:34:50 +0300 Subject: [PATCH] rgw: no need to RGWReshard::get before remove Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 9 +-------- src/rgw/rgw_reshard.cc | 5 ++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 786c7efdc00..e9dc04d29f1 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -5879,17 +5879,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 5ea9b3859a6..cde521ff7dc 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -675,7 +675,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; } -- 2.39.5