]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs-mirror: fix option typo and document certain options
authorVenky Shankar <vshankar@redhat.com>
Sun, 1 Nov 2020 12:56:42 +0000 (07:56 -0500)
committerVenky Shankar <vshankar@redhat.com>
Tue, 12 Jan 2021 10:56:52 +0000 (05:56 -0500)
s/cephfs_mirror_mirror_action_update_interval/cephfs_mirror_action_update_interval/

Signed-off-by: Venky Shankar <vshankar@redhat.com>
src/common/options.cc
src/tools/cephfs_mirror/Mirror.cc

index 74e0378ad1489b1089176f9ea01f8c3eaeaf417b..2affa3e38c3c4398e85a3c4dc58eae83a874e311 100644 (file)
@@ -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."),
 
     });
 }
index c63d1b4229409a78d3cbc4c4fd3163b552f10b3c..62fdaa9f9ace5902490b507667e3927b613487f4 100644 (file)
@@ -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);