From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 10 May 2016 16:35:41 +0000 (-0400)
Subject: Merge pull request #8868 from Abhishekvrshny/wip-15666-jewel
X-Git-Tag: v10.2.1~30
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=978f30e100fa91c148fd2aeaadad2f6e7bb94f9a;p=ceph.git

Merge pull request #8868 from Abhishekvrshny/wip-15666-jewel

jewel: rbd CLI to retrieve rbd mirror state for a pool / specific image

Conflicts:
	src/tools/rbd_mirror/ImageReplayer.cc: trivial resolution

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

978f30e100fa91c148fd2aeaadad2f6e7bb94f9a
diff --cc src/tools/rbd_mirror/ImageReplayer.cc
index 26341e215b92b,65dde98c0d764..938bdc5f38129
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@@ -325,8 -360,22 +360,9 @@@ void ImageReplayer<I>::start_replay() 
    Context *on_finish(nullptr);
    {
      Mutex::Locker locker(m_lock);
 -    if (m_stop_requested) {
 -      on_start_fail_start(-EINTR, "start interrupted");
 -      return;
 -    }
 -
      assert(m_state == STATE_STARTING);
      m_state = STATE_REPLAYING;
+     m_state_desc.clear();
      std::swap(m_on_start_finish, on_finish);
    }