From: John Spray <john.spray@redhat.com>
Date: Thu, 1 Dec 2016 15:27:39 +0000 (+0000)
Subject: osdc/Journaler: remove incorrect assertion
X-Git-Tag: v12.0.1~140^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58ec1c6aeb011c9cc13855a8714ac473f916f901;p=ceph.git

osdc/Journaler: remove incorrect assertion

This asserted that flush_pos would be ahead of
safe_pos after calling _flush.  However, this
is not guaranteed to be the case because
prezeroing might prevent us from flushing
right now.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index ef4893c1aef8..629450d030fa 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -970,7 +970,6 @@ void Journaler::_issue_read(uint64_t len)
     if (flush_pos == safe_pos) {
       _flush(NULL);
     }
-    assert(flush_pos > safe_pos);
     waitfor_safe[flush_pos].push_back(new C_RetryRead(this));
     return;
   }