]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/LogMonitor: do not crash on log sub w/ no messages 21515/head
authorSage Weil <sage@redhat.com>
Tue, 17 Apr 2018 11:44:56 +0000 (06:44 -0500)
committerKefu Chai <kchai@redhat.com>
Thu, 19 Apr 2018 09:08:24 +0000 (17:08 +0800)
If sv == 0, we will fail to fetch a value and assert out.  Skip the loop
in that case.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9cc7e451c5cbc6961cf5a12e8d7fc335ae130b71)

src/mon/LogMonitor.cc

index 178f78589df5fb80c74becba716dd72b6f976689..dc2991b364ae6713ea4ae7dee2e80a72ef54a2a9 100644 (file)
@@ -647,7 +647,7 @@ void LogMonitor::_create_sub_incremental(MLog *mlog, int level, version_t sv)
   }
 
   version_t summary_ver = summary.version;
-  while (sv <= summary_ver) {
+  while (sv && sv <= summary_ver) {
     bufferlist bl;
     int err = get_version(sv, bl);
     assert(err == 0);