From: Mykola Golub <mgolub@mirantis.com>
Date: Sun, 12 Jun 2016 17:32:45 +0000 (+0300)
Subject: rbd-mirror: FAILED assert(!m_status_watcher)
X-Git-Tag: v11.0.0~200^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9653%2Fhead;p=ceph.git

rbd-mirror: FAILED assert(!m_status_watcher)

Fixes: http://tracker.ceph.com/issues/16245
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd_mirror/Replayer.cc b/src/tools/rbd_mirror/Replayer.cc
index 58c25d8b35e0..07b79915ec2c 100644
--- a/src/tools/rbd_mirror/Replayer.cc
+++ b/src/tools/rbd_mirror/Replayer.cc
@@ -599,7 +599,7 @@ void Replayer::set_sources(const ImageIds &image_ids)
     return;
   }
 
-  if (m_image_replayers.empty()) {
+  if (m_image_replayers.empty() && !existing_image_replayers) {
     // create entry for pool if it doesn't exist
     r = mirror_image_status_init();
     if (r < 0) {