From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Jan 2018 18:37:48 +0000 (-0600)
Subject: Merge pull request #18971 from liewegas/wip-pg-scrub-preempt
X-Git-Tag: v13.0.2~494
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2d28e2750643de0226dd3bccde61b7ceb62ba29;p=ceph-ci.git

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

osd/PG: allow scrub preemption

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

c2d28e2750643de0226dd3bccde61b7ceb62ba29
diff --cc src/common/options.cc
index f9eaec40f85,24c04030514..505cf277e7f
--- a/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)