From a4c181fa7ab6ced676b9ff4f1381555215d77152 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 16 Mar 2017 21:45:46 -0400 Subject: [PATCH] mds: set ceph-mds name uncond for external tools External tools like logrotate which use killall rely on the "ceph-mds" name to find it in /proc/*/comm. This is normally the case but when ceph-mds respawns using /proc/self/exe (on Linux), its name will change to "exe". This makes logrotate fail to signal ceph-mds the log needs to be reopened and will lead to the log growing until the disk is full. This patch unconditionally sets the name so on respawn the name is correct (and in any other possible scenario, such as a misnamed executable). Note, there is still a very small race between execve and ceph_pthread_setname where the process name is wrong. Problem was introduced by 66a122025f6cf023cf7b2f3d8fbe4964fb7568a7. Fixes: http://tracker.ceph.com/issues/19291 Signed-off-by: Patrick Donnelly (cherry picked from commit 4f177bb6b72cf9c8eb363051b27496c026b345f0) Conflicts: src/ceph_mds.cc - use pthread_setname_np() instead of ceph_pthread_setname(), drop compat.h include --- src/ceph_mds.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 40ac730a3b72c..43a025263f4f7 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -89,6 +90,8 @@ static void handle_mds_signal(int signum) int main(int argc, const char **argv) { + pthread_setname_np(pthread_self(), "ceph-mds"); + vector args; argv_to_vec(argc, argv, args); env_to_vec(args); -- 2.39.5