From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 15 Mar 2016 16:39:10 +0000 (-0400)
Subject: journal: reschedule watch if no entries available during live replay
X-Git-Tag: v10.1.0~77^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=921409f721d43f617a27fc1f447eaba08c36e60c;p=ceph.git

journal: reschedule watch if no entries available during live replay

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

diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index 2f1b31657f89c..4d6382cc4bf2a 100644
--- a/src/journal/JournalPlayer.cc
+++ b/src/journal/JournalPlayer.cc
@@ -352,7 +352,9 @@ int JournalPlayer::process_playback(uint64_t object_number) {
   ObjectPlayerPtr object_player = get_object_player();
   if (verify_playback_ready()) {
     notify_entries_available();
-  } else if (!m_watch_enabled && is_object_set_ready()) {
+  } else if (m_watch_enabled) {
+    schedule_watch();
+  } else {
     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;