From: tancz1 <tancz1@lenovo.com>
Date: Tue, 26 Oct 2021 09:25:20 +0000 (+0800)
Subject: osd: fix 'ceph osd stop <osd.nnn>' doesn't take effect
X-Git-Tag: v15.2.16~58^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16d0cf6499e6892c4cc847b92a6b5174b0becf53;p=ceph.git

osd: fix 'ceph osd stop <osd.nnn>' 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)
---

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();