From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 14 Jul 2015 12:44:03 +0000 (-0400)
Subject: journal: signal playback complete via finisher thread
X-Git-Tag: v10.0.1~102^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b97bc2b0645422317f7bc56bbdf8d84cebf51b6f;p=ceph.git

journal: signal playback complete via finisher thread

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

diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index 9172a7046f35..5b90dec744a3 100644
--- a/src/journal/JournalPlayer.cc
+++ b/src/journal/JournalPlayer.cc
@@ -2,6 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "journal/JournalPlayer.h"
+#include "common/Finisher.h"
 #include "journal/ReplayHandler.h"
 #include "journal/Utils.h"
 
@@ -11,6 +12,22 @@
 
 namespace journal {
 
+namespace {
+
+struct C_HandleComplete: public Context {
+  ReplayHandler *replay_handler;
+
+  C_HandleComplete(ReplayHandler *_replay_handler)
+    : replay_handler(_replay_handler) {
+  }
+
+  virtual void finish(int r) {
+    replay_handler->handle_complete(r);
+  }
+};
+
+} // anonymous namespace
+
 JournalPlayer::JournalPlayer(librados::IoCtx &ioctx,
                              const std::string &object_oid_prefix,
                              const JournalMetadataPtr& journal_metadata,
@@ -95,9 +112,8 @@ bool JournalPlayer::try_pop_front(Entry *entry,
       object_player->watch(&m_process_state, m_watch_interval);
       m_watch_scheduled = true;
     } else if (!m_watch_enabled && !object_player->is_fetch_in_progress()) {
-      m_lock.Unlock();
-      m_replay_handler->handle_complete(0);
-      m_lock.Lock();
+      m_journal_metadata->get_finisher().queue(new C_HandleComplete(
+        m_replay_handler), 0);
     }
     return false;
   }
@@ -111,9 +127,8 @@ bool JournalPlayer::try_pop_front(Entry *entry,
     lderr(m_cct) << "missing prior journal entry: " << *entry << dendl;
 
     m_state = STATE_ERROR;
-    m_lock.Unlock();
-    m_replay_handler->handle_complete(-EINVAL);
-    m_lock.Lock();
+    m_journal_metadata->get_finisher().queue(new C_HandleComplete(
+      m_replay_handler), -EINVAL);
     return false;
   }
 
@@ -238,9 +253,8 @@ int JournalPlayer::process_prefetch() {
   } else {
     ldout(m_cct, 10) << __func__ << ": no uncommitted entries available"
                      << dendl;
-    m_lock.Unlock();
-    m_replay_handler->handle_complete(0);
-    m_lock.Lock();
+    m_journal_metadata->get_finisher().queue(new C_HandleComplete(
+      m_replay_handler), 0);
   }
   return 0;
 }