Merge PR ceph#44337 into master

* refs/pull/44337/head: mon: prevent new sessions during shutdown Reviewed-by: Patrick Donnelly <[email protected]>
mitsu-ko · Dec 17, 2021 · b55781d · b55781d
2 parents aa98a82 + c98b268
commit b55781d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
@@ -6443,12 +6443,17 @@ void Monitor::ms_handle_accept(Connection *con)
     dout(10) << __func__ << " con " << con << " session " << s
 	     << " already on list" << dendl;
   } else {
+    std::lock_guard l(session_map_lock);
+    if (state == STATE_SHUTDOWN) {
+      dout(10) << __func__ << " ignoring new con " << con << " (shutdown)" << dendl;
+      con->mark_down();
+      return;
+    }
     dout(10) << __func__ << " con " << con << " session " << s
 	     << " registering session for "
 	     << con->get_peer_addrs() << dendl;
     s->_ident(entity_name_t(con->get_peer_type(), con->get_peer_id()),
 	      con->get_peer_addrs());
-    std::lock_guard l(session_map_lock);
     session_map.add_session(s);
   }
 }