rbd-mirror: allow to have different priority levels

for aggregated and per-image perf counters

Signed-off-by: Mykola Golub <mgolub@suse.com>

diff --git a/src/common/options.cc b/src/common/options.cc
index d552b4345a316aa470f55e859b88729a6339a561..32d066f2de588a4b564919acbd3433e76f0c24a1 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7465,6 +7465,15 @@ static std::vector<Option> get_rbd_mirror_options() {
     .set_min_max((int64_t)PerfCountersBuilder::PRIO_DEBUGONLY,
                  (int64_t)PerfCountersBuilder::PRIO_CRITICAL + 1),
 
+    Option("rbd_mirror_image_perf_stats_prio", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+    .set_default((int64_t)PerfCountersBuilder::PRIO_USEFUL)
+    .set_description("Priority level for mirror daemon per-image replication perf counters")
+    .set_long_description("The daemon will send per-image perf counter data to the "
+                          "manager daemon if the priority is not lower than "
+                          "mgr_stats_threshold.")
+    .set_min_max((int64_t)PerfCountersBuilder::PRIO_DEBUGONLY,
+                 (int64_t)PerfCountersBuilder::PRIO_CRITICAL + 1),
+
     Option("rbd_mirror_memory_autotune", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(true)
     .add_see_also("rbd_mirror_memory_target")

diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index 3d9bbf93946a5915dabcc95ecc08ab6e8d3fcd0e..4b6b73180c08ebf82c744b9df0c6607059a083eb 100644 (file)
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -1740,7 +1740,7 @@ void ImageReplayer<I>::register_admin_socket_hook() {
       m_asok_hook = asok_hook;
 
       CephContext *cct = static_cast<CephContext *>(m_local_io_ctx.cct());
-      auto prio = cct->_conf.get_val<int64_t>("rbd_mirror_perf_stats_prio");
+      auto prio = cct->_conf.get_val<int64_t>("rbd_mirror_image_perf_stats_prio");
       PerfCountersBuilder plb(g_ceph_context, "rbd_mirror_image_" + m_name,
                               l_rbd_mirror_first, l_rbd_mirror_last);
       plb.add_u64_counter(l_rbd_mirror_replay, "replay", "Replays", "r", prio);