mon: make 'ceph osd rm ...' wipe out all state bits, not just EXISTS

This ensures that when a new osd reclaims that id it behaves as if it were
really new.

Backport: argonaut
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f3a784cbda9ed764b6492da11126e186d01dc0ba..3f8f135cce5c8024f250ac3dc63499bde01c09fc 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2137,7 +2137,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
        } else if (osdmap.is_up(osd)) {
          ss << "osd." << osd << " is still up";
        } else {
-         pending_inc.new_state[osd] = CEPH_OSD_EXISTS;
+         pending_inc.new_state[osd] = osdmap.get_state(osd);
          if (any)
            ss << ", osd." << osd;
          else