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());
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) {
int RGWBucketReshard::do_reshard(int num_shards,
int max_entries,
- FaultInjector<std::string_view>& f,
+ const ReshardFaultInjector& f,
bool verbose,
ostream *out,
Formatter *formatter,
}
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,
{
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) {
class RadosStore;
} }
+using ReshardFaultInjector = FaultInjector<std::string_view>;
+
class RGWBucketReshardLock {
using Clock = ceph::coarse_mono_clock;
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,
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,