]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-objectstore-tool: return 0 if incmap is sane 31659/head
authorKefu Chai <kchai@redhat.com>
Fri, 16 Aug 2019 11:09:24 +0000 (19:09 +0800)
committerNeha Ojha <nojha@redhat.com>
Thu, 14 Nov 2019 22:50:33 +0000 (22:50 +0000)
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)

src/tools/rebuild_mondb.cc

index a02edc9871261c4fb792404d993a2a83613f3dea..b006f7aa16ff6c64b02bd874641bd7ea02a77ae2 100644 (file)
@@ -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: