From 685fc1cdc1f36351c4bc9d1b8b9854829c21d6bd Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 1 Dec 2015 21:36:47 -0500
Subject: [PATCH] journal: fire replay complete event after reading last object

Fixes: #13924
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 src/journal/JournalPlayer.cc | 26 ++++++++++++++++++--------
 src/journal/JournalPlayer.h  |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index 1fd674ad93ee1..b78f29c10451b 100644
--- a/src/journal/JournalPlayer.cc
+++ b/src/journal/JournalPlayer.cc
@@ -146,6 +146,7 @@ bool JournalPlayer::try_pop_front(Entry *entry, uint64_t *commit_tid) {
         m_watch_interval);
       m_watch_scheduled = true;
     } else if (!m_watch_enabled && !object_player->is_fetch_in_progress()) {
+      ldout(m_cct, 10) << __func__ << ": replay complete" << dendl;
       m_journal_metadata->get_finisher().queue(new C_HandleComplete(
         m_replay_handler), 0);
     }
@@ -199,7 +200,7 @@ void JournalPlayer::process_state(uint64_t object_number, int r) {
       break;
     case STATE_PLAYBACK:
       ldout(m_cct, 10) << "PLAYBACK" << dendl;
-      r = process_playback();
+      r = process_playback(object_number);
       break;
     case STATE_ERROR:
       ldout(m_cct, 10) << "ERROR" << dendl;
@@ -221,7 +222,7 @@ void JournalPlayer::process_state(uint64_t object_number, int r) {
 }
 
 int JournalPlayer::process_prefetch(uint64_t object_number) {
-  ldout(m_cct, 10) << __func__ << dendl;
+  ldout(m_cct, 10) << __func__ << ": object_num=" << object_number << dendl;
   assert(m_lock.is_locked());
 
   uint8_t splay_width = m_journal_metadata->get_splay_width();
@@ -311,17 +312,26 @@ int JournalPlayer::process_prefetch(uint64_t object_number) {
   return 0;
 }
 
-int JournalPlayer::process_playback() {
-  ldout(m_cct, 10) << __func__ << dendl;
+int JournalPlayer::process_playback(uint64_t object_number) {
+  ldout(m_cct, 10) << __func__ << ": object_num=" << object_number << dendl;
   assert(m_lock.is_locked());
 
   m_watch_scheduled = false;
 
   ObjectPlayerPtr object_player = get_object_player();
-  if (!object_player->empty()) {
-    ldout(m_cct, 10) << __func__ << ": entries available" << dendl;
-    m_journal_metadata->get_finisher().queue(new C_HandleEntriesAvailable(
-      m_replay_handler), 0);
+  if (object_player->get_object_number() == object_number) {
+    uint8_t splay_width = m_journal_metadata->get_splay_width();
+    uint64_t active_set = m_journal_metadata->get_active_set();
+    uint64_t object_set = object_player->get_object_number() / splay_width;
+    if (!object_player->empty()) {
+      ldout(m_cct, 10) << __func__ << ": entries available" << dendl;
+      m_journal_metadata->get_finisher().queue(new C_HandleEntriesAvailable(
+        m_replay_handler), 0);
+    } else if (object_set == active_set) {
+      ldout(m_cct, 10) << __func__ << ": replay complete" << dendl;
+      m_journal_metadata->get_finisher().queue(new C_HandleComplete(
+        m_replay_handler), 0);
+    }
   }
   return 0;
 }
diff --git a/src/journal/JournalPlayer.h b/src/journal/JournalPlayer.h
index 93347ea3f22ed..49680adac75b3 100644
--- a/src/journal/JournalPlayer.h
+++ b/src/journal/JournalPlayer.h
@@ -108,7 +108,7 @@ private:
 
   void process_state(uint64_t object_number, int r);
   int process_prefetch(uint64_t object_number);
-  int process_playback();
+  int process_playback(uint64_t object_number);
 
   void fetch(uint64_t object_num);
   void handle_fetched(uint64_t object_num, int r);
-- 
2.39.5