]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: add typedef for ReshardFaultInjector
authorCasey Bodley <cbodley@redhat.com>
Tue, 15 Dec 2020 17:55:03 +0000 (12:55 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Tue, 1 Feb 2022 14:11:13 +0000 (09:11 -0500)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_admin.cc
src/rgw/rgw_reshard.cc
src/rgw/rgw_reshard.h

index e69d1aec81b3933820bce2d84c4b445d6066742f..60714cdbc680d969a8c293b8b9e6bcf741403685 100644 (file)
@@ -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) {
index 4196c280d9f1eeff1975e29aa332fc8f1d20bb6c..eb0714fe52276d7dd39973d6df00ce6ecb782952 100644 (file)
@@ -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) {
index 2594ae295bc3c4768677cd196bc4d61e52550c6d..f4ade0476c9380f0efe6889ef7e136c53e085a23 100644 (file)
@@ -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,