From: John Spray <john.spray@redhat.com>
Date: Tue, 31 Jul 2018 16:49:00 +0000 (+0100)
Subject: mgrc: enable disabling stats via mgr_stats_threshold
X-Git-Tag: v13.2.2~103^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71005bbd68dd43cc781c7b9ba857b81fc10ac384;p=ceph.git

mgrc: enable disabling stats via mgr_stats_threshold

Because we had a min_max setting with CRIT the maximum,
it wasn't possible to actually turn off stats entirely.

Fixes: http://tracker.ceph.com/issues/25197
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 911fe5ce4fb5d0a7282dad87c2bfe6528c4f2fcf)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index dd7c5d37444..bc09af4f89f 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4693,7 +4693,7 @@ std::vector<Option> get_global_options() {
   .set_long_description("Daemons only set perf counter data to the manager "
     "daemon if the counter has a priority higher than this.")
   .set_min_max((int64_t)PerfCountersBuilder::PRIO_DEBUGONLY,
-               (int64_t)PerfCountersBuilder::PRIO_CRITICAL),
+               (int64_t)PerfCountersBuilder::PRIO_CRITICAL + 1),
 
     Option("journal_zero_on_create", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(false)