From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 1 Sep 2015 01:27:53 +0000 (-0400)
Subject: librbd: only erase IO events after they are marked safe
X-Git-Tag: v10.0.1~52^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b51531414d856d946549672d296e4aac7a078764;p=ceph.git

librbd: only erase IO events after they are marked safe

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

diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index 737a120f5a5bc..ca4221e11a756 100644
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -357,7 +357,9 @@ void Journal::complete_event(Events::iterator it, int r) {
                  << "r=" << r << dendl;
 
   m_journaler->committed(it->second.future);
-  m_events.erase(it);
+  if (it->second.safe) {
+    m_events.erase(it);
+  }
 }
 
 void Journal::handle_initialized(int r) {