summaryrefslogtreecommitdiff
path: root/src/mon
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-23 10:47:10 -0700
committerSage Weil <sage@inktank.com>2012-07-26 15:04:02 -0700
commit81d72e5d7ba4713eb7c290878d901e21c0709028 (patch)
tree14647a7610f32fceaf5ef7d0eb55c529b8a1dc91 /src/mon
parentad9c37f2c029f6eb372efb711b234014397057e9 (diff)
downloadceph-81d72e5d7ba4713eb7c290878d901e21c0709028.tar.gz
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>
Diffstat (limited to 'src/mon')
-rw-r--r--src/mon/OSDMonitor.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f3a784cbda9..3f8f135cce5 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