From 16d0cf6499e6892c4cc847b92a6b5174b0becf53 Mon Sep 17 00:00:00 2001 From: tancz1 Date: Tue, 26 Oct 2021 17:25:20 +0800 Subject: [PATCH] osd: fix 'ceph osd stop ' doesn't take effect when the osd state is in the non-active state, the osd daemon can be stopped. Fixes: https://tracker.ceph.com/issues/53039 Signed-off-by: tan changzhi <544463199@qq.com> (cherry picked from commit d595c95ef6c3dc34b8389ff4270639ff1550d269) --- src/osd/OSD.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c42fd05bedf01..4ba6ef84f9085 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -8287,6 +8287,9 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m) reset_heartbeat_peers(true); } } + } else if (osdmap->get_epoch() > 0 && osdmap->is_stop(whoami)) { + derr << "map says i am stopped by admin. shutting down." << dendl; + do_shutdown = true; } map_lock.unlock(); -- 2.39.5