summaryrefslogtreecommitdiffstats
path: root/src/journal/JournalPlayer.cc
diff options
context:
space:
mode:
authorJason Dillaman <dillaman@redhat.com>2016-03-15 17:39:10 +0100
committerJason Dillaman <dillaman@redhat.com>2016-03-15 17:39:10 +0100
commit921409f721d43f617a27fc1f447eaba08c36e60c (patch)
tree90288083d2ef6de182ee1704b386594845571a81 /src/journal/JournalPlayer.cc
parentlibrbd: correct valgrind memcheck errors (diff)
downloadceph-921409f721d43f617a27fc1f447eaba08c36e60c.tar.xz
ceph-921409f721d43f617a27fc1f447eaba08c36e60c.zip
journal: reschedule watch if no entries available during live replay
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'src/journal/JournalPlayer.cc')
-rw-r--r--src/journal/JournalPlayer.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index 2f1b31657f8..4d6382cc4bf 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;