Merge pull request #27413 from liu-chunmei/ceph_seastar_io_read

crimson/osd: support write pid_file when osd start Reviewed-by: Samuel Just <sjust@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · May 8, 2019 · 5b94f8b · 5b94f8b
2 parents 35dfd7c + 4a6028c
commit 5b94f8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
@@ -70,6 +70,7 @@ add_library(crimson-common STATIC
   ${PROJECT_SOURCE_DIR}/src/common/Thread.cc
   ${PROJECT_SOURCE_DIR}/src/common/HeartbeatMap.cc
   ${PROJECT_SOURCE_DIR}/src/common/PluginRegistry.cc
+  ${PROJECT_SOURCE_DIR}/src/global/pidfile.cc
   ${PROJECT_SOURCE_DIR}/src/librbd/Features.cc
   ${PROJECT_SOURCE_DIR}/src/log/Log.cc
   ${PROJECT_SOURCE_DIR}/src/mgr/ServiceMap.cc

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
@@ -13,6 +13,7 @@
 #include "common/ceph_argparse.h"
 #include "crimson/common/config_proxy.h"
 #include "crimson/net/SocketMessenger.h"
+#include "global/pidfile.h"
 
 #include "osd.h"
 
@@ -105,6 +106,7 @@ int main(int argc, char* argv[])
         });
         local_conf().parse_config_files(conf_file_list).get();
         local_conf().parse_argv(ceph_args).get();
+        pidfile_write(local_conf()->pid_file);
         const int whoami = std::stoi(local_conf()->name.get_id());
         const auto nonce = static_cast<uint32_t>(getpid());
         for (auto [msgr, name] : {make_pair(std::ref(cluster_msgr), "cluster"s),