Merge pull request #18971 from liewegas/wip-pg-scrub-preempt

osd/PG: allow scrub preemption

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc qa/tasks/ceph.py
Simple merge

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
index f9eaec40f85acf62a3945dbb558cf33b35f33cd5,24c04030514ab0faf6ed0001713f94c3e3e6a7a7..505cf277e7fae3df9ade7019dd315b0af7b76657
--- 1/src/common/options.cc
--- 2/src/common/options.cc
+++ b/src/common/options.cc
@@@ -3189,17 -3155,9 +3216,17 @@@ std::vector<Option> get_global_options(
      .set_default(1<<20)
      .set_description(""),
  
 +    Option("osd_pg_delete_priority", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
 +    .set_default(5)
 +    .set_description(""),
 +
 +    Option("osd_pg_delete_cost", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
 +    .set_default(1<<20)
 +    .set_description(""),
 +
      Option("osd_scrub_priority", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
      .set_default(5)
-     .set_description(""),
+     .set_description("Priority for scrub operations in work queue"),
  
      Option("osd_scrub_cost", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
      .set_default(50<<20)

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge