]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: OSDMonitor: fix some annoying whitespace
authorJoao Eduardo Luis <joao.luis@inktank.com>
Tue, 29 Oct 2013 20:30:37 +0000 (20:30 +0000)
committerSage Weil <sage@inktank.com>
Mon, 30 Dec 2013 21:07:12 +0000 (13:07 -0800)
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 42c4137cbfacad5654f02c6608cc0e81b45c06be)

src/mon/OSDMonitor.cc

index 3c10c42f0bd161da5a918aed238fb533a249ba46..58491263f36e1d58255496d486bbff94499f48e2 100644 (file)
@@ -3192,13 +3192,15 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
        }
       } else if (prefix == "osd rm") {
        if (osdmap.is_up(osd)) {
-       ss << "osd." << osd << " is still up; must be down before removal. ";
+          ss << "osd." << osd << " is still up; must be down before removal. ";
        } else {
          pending_inc.new_state[osd] = osdmap.get_state(osd);
-         if (any)
+          pending_inc.new_uuid[osd] = uuid_d();
+         if (any) {
            ss << ", osd." << osd;
-         else 
+          } else {
            ss << "removed osd." << osd;
+          }
          any = true;
        }
       }