@@ -33,7 +33,7 @@ ceph::io_sequence::tester::ProgramOptionSelector<T, N, Ts>
3333 po::variables_map vm,
3434 const std::string& option_name,
3535 bool set_forced,
36- bool select_first)
36+ bool select_first)
3737 : rng(rng),
3838 // choices(choices),
3939 option_name(option_name) {
@@ -86,7 +86,7 @@ ceph::io_sequence::tester::SelectBlockSize::SelectBlockSize(
8686
8787ceph::io_sequence::tester::SelectNumThreads::SelectNumThreads (
8888 ceph::util::random_number_generator<int >& rng,
89- po::variables_map vm)
89+ po::variables_map vm)
9090 : ProgramOptionSelector(rng, vm, " threads" , true , true )
9191{
9292}
@@ -99,9 +99,9 @@ ceph::io_sequence::tester::SelectSeqRange::SelectSeqRange(
9999 : ProgramOptionSelector(rng, vm, " sequence" , false , false )
100100{
101101 if (vm.count (option_name)) {
102- ceph::io_exerciser::Sequence s =
102+ ceph::io_exerciser::Sequence s =
103103 static_cast <ceph::io_exerciser::Sequence>(vm[" sequence" ].as <int >());
104- if (s < ceph::io_exerciser::Sequence::SEQUENCE_BEGIN ||
104+ if (s < ceph::io_exerciser::Sequence::SEQUENCE_BEGIN ||
105105 s >= ceph::io_exerciser::Sequence::SEQUENCE_END) {
106106 dout (0 ) << " Sequence argument out of range" << dendl;
107107 throw po::validation_error (po::validation_error::invalid_option_value);
@@ -127,7 +127,7 @@ const std::pair<ceph::io_exerciser::Sequence,ceph::io_exerciser::Sequence>
127127
128128
129129ceph::io_sequence::tester::SelectErasureKM::SelectErasureKM (
130- ceph::util::random_number_generator<int >& rng,
130+ ceph::util::random_number_generator<int >& rng,
131131 po::variables_map vm)
132132 : ProgramOptionSelector(rng, vm, " km" , true , true )
133133{
@@ -184,7 +184,7 @@ const std::string ceph::io_sequence::tester::SelectECPool::choose()
184184 const std::string plugin = std::string (spl.choose ());
185185 const uint64_t chunk_size = scs.choose ();
186186
187- std::string pool_name = " ec_" + plugin +
187+ std::string pool_name = " ec_" + plugin +
188188 " _cs" + std::to_string (chunk_size) +
189189 " _k" + std::to_string (k) +
190190 " _m" + std::to_string (m);
@@ -234,7 +234,7 @@ ceph::io_sequence::tester::TestObject::TestObject( const std::string oid,
234234 SelectECPool& spo,
235235 SelectObjectSize& sos,
236236 SelectNumThreads& snt,
237- SelectSeqRange & ssr,
237+ SelectSeqRange& ssr,
238238 ceph::util::random_number_generator<int >& rng,
239239 ceph::mutex& lock,
240240 ceph::condition_variable& cond,
@@ -247,20 +247,20 @@ ceph::io_sequence::tester::TestObject::TestObject( const std::string oid,
247247 if (dryrun) {
248248 verbose = true ;
249249 exerciser_model = std::make_unique<ceph::io_exerciser::ObjectModel>(oid,
250- sbs.choose (),
251- rng ());
250+ sbs.choose (),
251+ rng ());
252252 } else {
253253 const std::string pool = spo.choose ();
254254 int threads = snt.choose ();
255255 exerciser_model = std::make_unique<ceph::io_exerciser::RadosIo>(rados,
256- asio,
257- pool,
258- oid,
259- sbs.choose (),
260- rng (),
261- threads,
262- lock,
263- cond);
256+ asio,
257+ pool,
258+ oid,
259+ sbs.choose (),
260+ rng (),
261+ threads,
262+ lock,
263+ cond);
264264 dout (0 ) << " = " << oid << " pool=" << pool
265265 << " threads=" << threads
266266 << " blocksize=" << exerciser_model->get_block_size ()
@@ -276,9 +276,9 @@ ceph::io_sequence::tester::TestObject::TestObject( const std::string oid,
276276 rng ());
277277 op = seq->next ();
278278 done = false ;
279- dout (0 ) << " == " << exerciser_model->get_oid () << " "
280- << curseq << " "
281- << seq->get_name ()
279+ dout (0 ) << " == " << exerciser_model->get_oid () << " "
280+ << curseq << " "
281+ << seq->get_name ()
282282 << " ==" <<dendl;
283283}
284284
@@ -291,12 +291,12 @@ bool ceph::io_sequence::tester::TestObject::next()
291291{
292292 if (!done) {
293293 if (verbose) {
294- dout (0 ) << exerciser_model->get_oid ()
294+ dout (0 ) << exerciser_model->get_oid ()
295295 << " Step " << seq->get_step () << " : "
296296 << op->to_string (exerciser_model->get_block_size ()) << dendl;
297297 } else {
298- dout (5 ) << exerciser_model->get_oid ()
299- << " Step " << seq->get_step () << " : "
298+ dout (5 ) << exerciser_model->get_oid ()
299+ << " Step " << seq->get_step () << " : "
300300 << op->to_string (exerciser_model->get_block_size ()) << dendl;
301301 }
302302 exerciser_model->applyIoOp (*op);
@@ -311,9 +311,9 @@ bool ceph::io_sequence::tester::TestObject::next()
311311 seq = ceph::io_exerciser::IoSequence::generate_sequence (curseq,
312312 obj_size_range,
313313 has_seqseed ?
314- seqseed :
314+ seqseed :
315315 rng ());
316- dout (0 ) << " == " << exerciser_model->get_oid () << " "
316+ dout (0 ) << " == " << exerciser_model->get_oid () << " "
317317 << curseq << " " << seq->get_name ()
318318 << " ==" <<dendl;
319319 op = seq->next ();
0 commit comments