]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: make journal start_external_replay not block
authorMykola Golub <mgolub@mirantis.com>
Wed, 24 Feb 2016 11:35:23 +0000 (13:35 +0200)
committerMykola Golub <mgolub@mirantis.com>
Thu, 10 Mar 2016 09:11:14 +0000 (11:11 +0200)
Its caller shall check the journal is in right state.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
src/librbd/Journal.cc

index 4a2a9df6983a51fe1b3c24220031a6a04c09b63f..dcb62ae8f7923cf7735dcbb0574ba3f73b9727ae 100644 (file)
@@ -712,15 +712,6 @@ int Journal<I>::start_external_replay(journal::Replay<I> **journal_replay) {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << this << " " << __func__ << dendl;
 
-  C_SaferCond cond;
-  wait_for_journal_ready(&cond);
-  int r = cond.wait();
-  if (r < 0) {
-    lderr(cct) << "failed waiting for ready state: " << cpp_strerror(r)
-              << dendl;
-    return r;
-  }
-
   Mutex::Locker locker(m_lock);
   assert(m_state == STATE_READY);
   assert(m_journal_replay == nullptr);