]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
journal: reschedule watch if no entries available during live replay 8132/head
authorJason Dillaman <dillaman@redhat.com>
Tue, 15 Mar 2016 16:39:10 +0000 (12:39 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 15 Mar 2016 16:39:10 +0000 (12:39 -0400)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/journal/JournalPlayer.cc

index 2f1b31657f89cee70655e149bf3cbfcc4904bb17..4d6382cc4bf2ac59d67811b3e3ffe933045f3056 100644 (file)
@@ -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;