From: John Spray <john.spray@redhat.com>
Date: Wed, 25 May 2016 16:56:51 +0000 (+0100)
Subject: mon: fix missing osd metadata (again)
X-Git-Tag: v10.2.4~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1eedf181176ce75212a8cfbb87ac927350a826ed;p=ceph.git

mon: fix missing osd metadata (again)

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)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index a587c649b321..a74d183101f3 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -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;