From: Venky Shankar <vshankar@redhat.com>
Date: Sun, 1 Nov 2020 12:56:42 +0000 (-0500)
Subject: cephfs-mirror: fix option typo and document certain options
X-Git-Tag: v16.1.0~51^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5d616f711688f3d8651097b5aceaeb78eb51665;p=ceph.git

cephfs-mirror: fix option typo and document certain options

s/cephfs_mirror_mirror_action_update_interval/cephfs_mirror_action_update_interval/

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 74e0378ad148..2affa3e38c3c 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -8903,17 +8903,17 @@ std::vector<Option> get_cephfs_mirror_options() {
     .set_description("policy for choosing directories to mirror snapshots")
     .set_long_description("policy used by cephfs-mirror daemon to choose directories for snapshot mirroring"),
 
-    Option("cephfs_mirror_mirror_action_update_interval", Option::TYPE_SECS, Option::LEVEL_ADVANCED)
+    Option("cephfs_mirror_action_update_interval", Option::TYPE_SECS, Option::LEVEL_ADVANCED)
     .set_default(2)
     .set_min(1)
-    .set_description("")
-    .set_long_description(""),
+    .set_description("interval for driving asynchornous mirror actions")
+    .set_long_description("Interval in seconds to process pending mirror update actions."),
 
     Option("cephfs_mirror_restart_mirror_on_blocklist_interval", Option::TYPE_SECS, Option::LEVEL_ADVANCED)
     .set_default(30)
     .set_min(0)
-    .set_description("")
-    .set_long_description(""),
+    .set_description("interval to restart blocklisted instances")
+    .set_long_description("Interval in seconds to restart blocklisted mirror instances. Setting to zero (0) disables restarting blocklisted instances."),
 
     });
 }
diff --git a/src/tools/cephfs_mirror/Mirror.cc b/src/tools/cephfs_mirror/Mirror.cc
index c63d1b422940..62fdaa9f9ace 100644
--- a/src/tools/cephfs_mirror/Mirror.cc
+++ b/src/tools/cephfs_mirror/Mirror.cc
@@ -496,7 +496,7 @@ void Mirror::schedule_mirror_update_task() {
                                      update_fs_mirrors();
                                    });
   double after = g_ceph_context->_conf.get_val<std::chrono::seconds>
-    ("cephfs_mirror_mirror_action_update_interval").count();
+    ("cephfs_mirror_action_update_interval").count();
   dout(20) << ": scheduling fs mirror update (" << m_timer_task << ") after "
            << after << " seconds" << dendl;
   m_timer->add_event_after(after, m_timer_task);