Merge pull request #16360 from dillaman/wip-rbd-mirror-service-daemon

mgr/dashboard: rbd mirroring status page

Reviewed-by: John Spray <john.spray@redhat.com>

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/pybind/mgr/dashboard/module.py
Simple merge

diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge

diff --cc src/test/rbd_mirror/test_ClusterWatcher.cc
Simple merge

diff --cc src/test/rbd_mirror/test_ImageReplayer.cc
Simple merge

diff --cc src/tools/rbd_mirror/InstanceReplayer.cc
index 5c2fa13a7ab60ad408c28ba6f93a7eba8325b036,a100a8f31ac4c964abfb73234ffc23f1d9d4c7de..fe874875442a2c5aa66af581ecce276ec033918a
--- 1/src/tools/rbd_mirror/InstanceReplayer.cc
--- 2/src/tools/rbd_mirror/InstanceReplayer.cc
+++ b/src/tools/rbd_mirror/InstanceReplayer.cc
@@@ -483,10 -515,11 +515,10 @@@ void InstanceReplayer<I>::schedule_imag
        assert(m_threads->timer_lock.is_locked());
        m_image_state_check_task = nullptr;
        schedule_image_state_check_task();
-       start_image_replayers();
+       queue_start_image_replayers();
      });
  
 -  int after =
 -    max(1, g_ceph_context->_conf->rbd_mirror_image_state_check_interval);
 +  int after = g_ceph_context->_conf->rbd_mirror_image_state_check_interval;
  
    dout(20) << "scheduling image state check after " << after << " sec (task "
             << m_image_state_check_task << ")" << dendl;