From: Sage Weil <sage@inktank.com>
Date: Mon, 23 Jul 2012 17:47:10 +0000 (-0700)
Subject: mon: make 'ceph osd rm ...' wipe out all state bits, not just EXISTS
X-Git-Tag: v0.48.1argonaut~19
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=81d72e5d7ba4713eb7c290878d901e21c0709028;p=ceph.git

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 f3a784cbda9ed..3f8f135cce5c8 100644
--- 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