Merge pull request #32055 from smithfarm/wip-42733-nautilus

nautilus: rgw: auto-clean reshard queue entries for non-existent buckets

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

diff --cc src/rgw/rgw_reshard.cc
index ca58c757cc9ad23ae5cdba5680c603aab6959268,356179462aad0105f939e784b6ca1d07c4251e04..7237e5073ce01415ddc9e6e33433d9d1687157d8
--- 1/src/rgw/rgw_reshard.cc
--- 2/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@@ -1013,11 -1039,14 +1035,11 @@@ int RGWReshard::process_single_logshard
        }
  
        RGWBucketReshard br(store, bucket_info, attrs, nullptr);
 -
 -      Formatter* formatter = new JSONFormatter(false);
 -      auto formatter_ptr = std::unique_ptr<Formatter>(formatter);
 -      ret = br.execute(entry.new_num_shards, max_entries, true, nullptr,
 -                       formatter, this);
 +      ret = br.execute(entry.new_num_shards, max_entries, false, nullptr,
 +                       nullptr, this);
        if (ret < 0) {
-         ldout (store->ctx(), 0) <<  __func__ <<
-           "ERROR in reshard_bucket " << entry.bucket_name << ":" <<
+         ldout(store->ctx(), 0) <<  __func__ <<
+           ": Error during resharding bucket " << entry.bucket_name << ":" <<
            cpp_strerror(-ret)<< dendl;
          return ret;
        }