Merge pull request ceph#63390 from taodd/fix-ms_async_op_threads

common: fix the ms_async_op_threads not applied successfully for daemons running in foreground mode

Author: SrinivasaBharath

src/common/ceph_context.cc

@@ -1084,6 +1084,19 @@ CryptoHandler *CephContext::get_crypto_handler(int type)
   }
 }
 
+void CephContext::drop_temp_messenger_obj()
+{
+  auto i = associated_objs.begin();
+  while (i != associated_objs.end()) {
+    if (i->first.first.find("AsyncMessenger::NetworkStack") != std::string::npos) {
+      i = associated_objs.erase(i);
+      break;
+    } else {
+      ++i;
+    }
+  }
+}
+
 void CephContext::notify_pre_fork()
 {
   {

src/common/ceph_context.h

@@ -284,6 +284,7 @@ class CephContext {
     _fork_watchers.push_back(w);
   }
 
+  void drop_temp_messenger_obj();
   void notify_pre_fork();
   void notify_post_fork();
 

src/global/global_init.cc

@@ -503,7 +503,7 @@ int global_init_prefork(CephContext *cct)
       chown_path(conf->pid_file, cct->get_set_uid(), cct->get_set_gid(),
 		 cct->get_set_uid_string(), cct->get_set_gid_string());
     }
-
+    cct->drop_temp_messenger_obj();
     return -1;
   }