]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-objectstore-tool: return 0 if incmap is sane 30740/head
authorKefu Chai <kchai@redhat.com>
Fri, 16 Aug 2019 11:09:24 +0000 (19:09 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 15 Nov 2019 10:22:27 +0000 (11:22 +0100)
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 aa4b7746905b6e34a705020b3751cc5f8b00f267..8e3d5b45888024813bf35a1cf422fe5a61d0c057 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: