From 36e8962d497e649c9607f6e20493968a104ef357 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 15 Dec 2020 12:55:03 -0500
Subject: [PATCH] rgw: add typedef for ReshardFaultInjector

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---
 src/rgw/rgw_admin.cc   | 3 +--
 src/rgw/rgw_reshard.cc | 6 +++---
 src/rgw/rgw_reshard.h  | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index e69d1aec81b39..60714cdbc680d 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -6091,8 +6091,6 @@ int main(int argc, const char **argv)
       return EINVAL;
   }
 
-  // to test using FaultInjector
-  FaultInjector<std::string_view> fault;
   if (!rgw::sal::User::empty(user)) {
     user_op.set_user_id(user->get_id());
     bucket_op.set_user_id(user->get_id());
@@ -7571,6 +7569,7 @@ next:
       max_entries = DEFAULT_RESHARD_MAX_ENTRIES;
     }
 
+    ReshardFaultInjector fault;
     if (inject_error_at) {
       fault.inject(*inject_error_at, InjectError{-EIO, dpp()});
     } else if (inject_abort_at) {
diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 4196c280d9f1e..eb0714fe52276 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -512,7 +512,7 @@ int RGWBucketReshardLock::renew(const Clock::time_point& now) {
 
 int RGWBucketReshard::do_reshard(int num_shards,
 				 int max_entries,
-         FaultInjector<std::string_view>& f,
+                                 const ReshardFaultInjector& f,
 				 bool verbose,
 				 ostream *out,
 				 Formatter *formatter,
@@ -689,7 +689,7 @@ int RGWBucketReshard::update_bucket(rgw::BucketReshardState s, const DoutPrefixP
 }
 
 int RGWBucketReshard::execute(int num_shards,
-                              FaultInjector<std::string_view>& f,
+                              const ReshardFaultInjector& f,
                               int max_op_entries,
                               const DoutPrefixProvider *dpp,
                               bool verbose, ostream *out,
@@ -1039,7 +1039,7 @@ int RGWReshard::process_single_logshard(int logshard_num, const DoutPrefixProvid
 	{
 	RGWBucketReshard br(store, bucket_info, nullptr);
 
-  FaultInjector<std::string_view> f;
+  ReshardFaultInjector f;
 	ret = br.execute(entry.new_num_shards, f, max_entries, dpp,
                          false, nullptr, nullptr, this);
 	if (ret < 0) {
diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
index 2594ae295bc3c..f4ade0476c938 100644
--- a/src/rgw/rgw_reshard.h
+++ b/src/rgw/rgw_reshard.h
@@ -29,6 +29,8 @@ namespace rgw { namespace sal {
   class RadosStore;
 } }
 
+using ReshardFaultInjector = FaultInjector<std::string_view>;
+
 class RGWBucketReshardLock {
   using Clock = ceph::coarse_mono_clock;
 
@@ -89,7 +91,7 @@ private:
   int update_bucket(rgw::BucketReshardState s, const DoutPrefixProvider* dpp);
 
   int do_reshard(int num_shards,
-                 int max_entries, FaultInjector<std::string_view>& f,
+                 int max_entries, const ReshardFaultInjector& f,
                  bool verbose,
                  std::ostream *os,
 		 Formatter *formatter,
@@ -101,7 +103,7 @@ public:
   RGWBucketReshard(rgw::sal::RadosStore* _store,
 		   const RGWBucketInfo& _bucket_info,
 		   RGWBucketReshardLock* _outer_reshard_lock);
-  int execute(int num_shards, FaultInjector<std::string_view>& f,
+  int execute(int num_shards, const ReshardFaultInjector& f,
               int max_op_entries, const DoutPrefixProvider *dpp,
               bool verbose = false, std::ostream *out = nullptr,
               ceph::Formatter *formatter = nullptr,
-- 
2.39.5