From a0786829fd8b45167f2d2996b7355ca37c9359e7 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Mon, 24 Jun 2024 09:32:35 +0200 Subject: [PATCH] LU-17971 gss: do not make lsvcgss record its PID The lsvcgssd daemon is expected to spawn a few additional threads at startup to carry out extra work. In this case finding the PID of the 'main' thread can be complicated. So do not try to record this by ourselves, and let systemctl handle that. Test-Parameters: trivial Test-Parameters: testgroup=review-dne-selinux-ssk-part-1 Test-Parameters: testgroup=review-dne-selinux-ssk-part-2 Test-Parameters: kerberos=true testlist=sanity-krb5 Signed-off-by: Sebastien Buisson Change-Id: I7ddfcd5b5f3c69a46079b42d76fb9585953e30b1 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55509 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/scripts/lsvcgss_sysd | 4 ---- lustre/scripts/systemd/lsvcgss.service | 1 - 2 files changed, 5 deletions(-) diff --git a/lustre/scripts/lsvcgss_sysd b/lustre/scripts/lsvcgss_sysd index 810931a..3b0b5cb 100644 --- a/lustre/scripts/lsvcgss_sysd +++ b/lustre/scripts/lsvcgss_sysd @@ -3,9 +3,6 @@ # lsvcgss Lustre GSS daemon # -# Must be identical to what lsvcgss.service uses -PIDFILE=/var/run/lsvcgss.pid - # If service is not configured, launch with all mechs # -k -- Enable kerberos support # -s -- Enable shared key support @@ -17,6 +14,5 @@ LSVCGSSDARGS="-k -s -z" /usr/sbin/lsvcgssd ${LSVCGSSDARGS} RETVAL=$? -[ $RETVAL -eq 0 ] && echo $(pidof -s lsvcgssd) > $PIDFILE exit $RETVAL diff --git a/lustre/scripts/systemd/lsvcgss.service b/lustre/scripts/systemd/lsvcgss.service index 09407c1..3577698 100644 --- a/lustre/scripts/systemd/lsvcgss.service +++ b/lustre/scripts/systemd/lsvcgss.service @@ -7,7 +7,6 @@ After=network-online.target openibd.service rdma.service opa.service Type=forking RemainAfterExit=yes StandardOutput=syslog -PIDFile=/var/run/lsvcgss.pid ExecStart=/usr/bin/lsvcgss_sysd ExecReload=/bin/kill -HUP $MAINPID -- 1.8.3.1