Merge pull request #43244 from ronen-fr/wip-rf-scrub-command

osd: make 'pg deep-scrub' command initiate a scrub

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Ronen Friedman 2021-11-23 15:19:33 +02:00 committed by GitHub
commit f600acbba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1176,9 +1176,8 @@ void PrimaryLogPG::do_command(
stamp -= 100.0; // push back last scrub more for good measure
if (deep) {
set_last_deep_scrub_stamp(stamp);
} else {
set_last_scrub_stamp(stamp); // also for 'deep', as we use this value to order scrubs
}
set_last_scrub_stamp(stamp); // for 'deep' as well, as we use this value to order scrubs
f->open_object_section("result");
f->dump_bool("deep", deep);
f->dump_stream("stamp") << stamp;