]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
journal: replay position might change after pruning stale tags 9269/head
authorJason Dillaman <dillaman@redhat.com>
Thu, 19 May 2016 19:52:16 +0000 (15:52 -0400)
committerJason Dillaman <dillaman@redhat.com>
Mon, 23 May 2016 12:33:05 +0000 (08:33 -0400)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0f5f1c375d8ef7b301cfd20b6848bdc81a761746)

src/journal/JournalPlayer.cc

index 426624c0ad322abe6b3b69418cd53aa9a361a36d..03b70e7712880df348de068761d11ccc5862b149 100644 (file)
@@ -351,13 +351,13 @@ int JournalPlayer::process_playback(uint64_t object_number) {
   ldout(m_cct, 10) << __func__ << ": object_num=" << object_number << dendl;
   assert(m_lock.is_locked());
 
-  ObjectPlayerPtr object_player = get_object_player();
   if (verify_playback_ready()) {
     notify_entries_available();
   } else if (is_object_set_ready()) {
     if (m_watch_enabled) {
       schedule_watch();
     } else {
+      ObjectPlayerPtr object_player = get_object_player();
       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;