From: Kefu Chai <kchai@redhat.com>
Date: Fri, 16 Aug 2019 11:09:24 +0000 (+0800)
Subject: ceph-objectstore-tool: return 0 if incmap is sane
X-Git-Tag: v14.2.5~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30740%2Fhead;p=ceph.git

ceph-objectstore-tool: return 0 if incmap is sane

this change addresses the regression introduced by 2e2414b3

Fixes: https://tracker.ceph.com/issues/41177
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d03f397544187d7de21d4849f58ce51baafcff8b)
---

diff --git a/src/tools/rebuild_mondb.cc b/src/tools/rebuild_mondb.cc
index aa4b7746905b..8e3d5b458880 100644
--- a/src/tools/rebuild_mondb.cc
+++ b/src/tools/rebuild_mondb.cc
@@ -277,6 +277,7 @@ int update_osdmap(ObjectStore& fs, OSDSuperblock& sb, MonitorDBStore& ms)
           // inc.decode() verifies `inc_crc`, so it's been taken care of.
         }
       }
+      return 0;
     }();
     switch (add_inc_result) {
     case -ENOENT: