Merge pull request #9226 from dillaman/wip-15950

jewel: rbd-mirror: potential crash during image status update Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · May 20, 2016 · 7834070 · 7834070
2 parents 9873fc1 + 5f09b9a
commit 7834070
Show file tree

Hide file tree

Showing 5 changed files with 309 additions and 227 deletions.
diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
@@ -494,6 +494,7 @@ bool JournalPlayer::prune_active_tag() {
   uint64_t tag_tid = *m_active_tag_tid;
   m_active_tag_tid = boost::none;
   m_splay_offset = 0;
+  m_watch_step = WATCH_STEP_FETCH_CURRENT;
 
   return prune_tag(tag_tid);
 }