From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 10 Feb 2022 22:06:23 +0000 (-0500)
Subject: rgw: pass non-const ReshardFaultInjector
X-Git-Tag: v18.0.0~787^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1be9c9f2c1ad2eae7f91c10c9f2b9444e77348f8;p=ceph.git

rgw: pass non-const ReshardFaultInjector

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 1127aba20a43..b7f23ce170ba 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -325,7 +325,7 @@ static int init_target_index(rgw::sal::RadosStore* store,
 static int init_target_layout(rgw::sal::RadosStore* store,
                               RGWBucketInfo& bucket_info,
 			      std::map<std::string, bufferlist>& bucket_attrs,
-                              const ReshardFaultInjector& fault,
+                              ReshardFaultInjector& fault,
                               uint32_t new_num_shards,
                               const DoutPrefixProvider* dpp)
 {
@@ -391,7 +391,7 @@ static int init_target_layout(rgw::sal::RadosStore* store,
 static int revert_target_layout(rgw::sal::RadosStore* store,
                                 RGWBucketInfo& bucket_info,
 				std::map<std::string, bufferlist>& bucket_attrs,
-                                const ReshardFaultInjector& fault,
+                                ReshardFaultInjector& fault,
                                 const DoutPrefixProvider* dpp)
 {
   auto& layout = bucket_info.layout;
@@ -429,7 +429,7 @@ static int revert_target_layout(rgw::sal::RadosStore* store,
 static int init_reshard(rgw::sal::RadosStore* store,
                         RGWBucketInfo& bucket_info,
 			std::map<std::string, bufferlist>& bucket_attrs,
-                        const ReshardFaultInjector& fault,
+                        ReshardFaultInjector& fault,
                         uint32_t new_num_shards,
                         const DoutPrefixProvider *dpp)
 {
@@ -457,7 +457,7 @@ static int init_reshard(rgw::sal::RadosStore* store,
 static int cancel_reshard(rgw::sal::RadosStore* store,
                           RGWBucketInfo& bucket_info,
 			  std::map<std::string, bufferlist>& bucket_attrs,
-                          const ReshardFaultInjector& fault,
+                          ReshardFaultInjector& fault,
                           const DoutPrefixProvider *dpp)
 {
   static constexpr auto max_retries = 10;
@@ -488,7 +488,7 @@ static int cancel_reshard(rgw::sal::RadosStore* store,
 static int commit_reshard(rgw::sal::RadosStore* store,
                           RGWBucketInfo& bucket_info,
 			  std::map<std::string, bufferlist>& bucket_attrs,
-                          const ReshardFaultInjector& fault,
+                          ReshardFaultInjector& fault,
                           const DoutPrefixProvider *dpp)
 {
   static constexpr auto max_retries = 10;
@@ -579,7 +579,7 @@ int RGWBucketReshard::clear_resharding(rgw::sal::RadosStore* store,
 				       std::map<std::string, bufferlist>& bucket_attrs,
                                        const DoutPrefixProvider* dpp)
 {
-  constexpr ReshardFaultInjector no_fault;
+  ReshardFaultInjector no_fault;
   return cancel_reshard(store, bucket_info, bucket_attrs, no_fault, dpp);
 }
 
@@ -825,7 +825,7 @@ int RGWBucketReshard::get_status(const DoutPrefixProvider *dpp, list<cls_rgw_buc
 }
 
 int RGWBucketReshard::execute(int num_shards,
-                              const ReshardFaultInjector& fault,
+                              ReshardFaultInjector& fault,
                               int max_op_entries,
                               const DoutPrefixProvider *dpp,
                               bool verbose, ostream *out,
diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
index a9b5e2c985b8..d8a8e4991db6 100644
--- a/src/rgw/rgw_reshard.h
+++ b/src/rgw/rgw_reshard.h
@@ -98,7 +98,7 @@ public:
 		   const RGWBucketInfo& _bucket_info,
 		   const std::map<std::string, bufferlist>& _bucket_attrs,
 		   RGWBucketReshardLock* _outer_reshard_lock);
-  int execute(int num_shards, const ReshardFaultInjector& f,
+  int execute(int num_shards, ReshardFaultInjector& f,
               int max_op_entries, const DoutPrefixProvider *dpp,
               bool verbose = false, std::ostream *out = nullptr,
               ceph::Formatter *formatter = nullptr,