From: John Spray <jspray@redhat.com>
Date: Mon, 24 Jul 2017 13:00:51 +0000 (+0100)
Subject: Merge pull request #16360 from dillaman/wip-rbd-mirror-service-daemon
X-Git-Tag: v12.1.2~151
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34f412573d9891150e130729025c2441290daea3;p=ceph.git

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>
---

34f412573d9891150e130729025c2441290daea3
diff --cc src/tools/rbd_mirror/InstanceReplayer.cc
index 5c2fa13a7ab,a100a8f31ac..fe874875442
--- a/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;