]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix missing osd metadata (again) 11642/head
authorJohn Spray <john.spray@redhat.com>
Wed, 25 May 2016 16:56:51 +0000 (17:56 +0100)
committerKefu Chai <kchai@redhat.com>
Tue, 25 Oct 2016 12:29:55 +0000 (20:29 +0800)
The JSON output was getting broken by continuing
in the wrong place.

Fixes: http://tracker.ceph.com/issues/17685
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit c5700ce4b45b3a385fe4c2111da852bea7d86da2)

src/mon/OSDMonitor.cc

index a587c649b3216be523942276db81f8c0138f6ab6..a74d183101f311625389a03cf84b5c41e0bb37e2 100644 (file)
@@ -3327,7 +3327,6 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
             // Drop error, continue to get other daemons' metadata
             dout(4) << "No metadata for osd." << i << dendl;
             r = 0;
-            continue;
           } else if (r < 0) {
             // Unexpected error
             goto reply;