233933
From fe9159ee42f0f67b01e6a495df8105ea0f66738d Mon Sep 17 00:00:00 2001
233933
From: Mohammed Rafi KC <rkavunga@redhat.com>
233933
Date: Thu, 30 May 2019 23:48:05 +0530
233933
Subject: [PATCH 183/192] glusterd/svc: Stop stale process using the
233933
 glusterd_proc_stop
233933
233933
While restarting a glusterd process, when we have a stale pid
233933
we were doing a simple kill. Instead we can use glusterd_proc_stop
233933
Because it has more logging plus force kill in case if there is
233933
any problem with kill signal handling.
233933
233933
Upstream patch: https://review.gluster.org/#/c/glusterfs/+/22791/
233933
233933
>Change-Id: I4a2dadc210a7a65762dd714e809899510622b7ec
233933
>updates: bz#1710054
233933
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
233933
233933
Change-Id: I3327528d8ebf90bbb2221265a0cf059c9359f141
233933
BUG: 1720248
233933
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
233933
Reviewed-on: https://code.engineering.redhat.com/gerrit/172290
233933
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
233933
Tested-by: RHGS Build Bot <nigelb@redhat.com>
233933
---
233933
 xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 6 +++---
233933
 1 file changed, 3 insertions(+), 3 deletions(-)
233933
233933
diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
233933
index 6a3ca52..a6e662f 100644
233933
--- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
233933
+++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
233933
@@ -488,9 +488,9 @@ glusterd_shd_svc_mux_init(glusterd_volinfo_t *volinfo, glusterd_svc_t *svc)
233933
 
233933
             if (!mux_proc) {
233933
                 if (pid != -1 && sys_access(svc->proc.pidfile, R_OK) == 0) {
233933
-                    /* stale pid file, unlink it. */
233933
-                    kill(pid, SIGTERM);
233933
-                    sys_unlink(svc->proc.pidfile);
233933
+                    /* stale pid file, stop and unlink it */
233933
+                    glusterd_proc_stop(&svc->proc, SIGTERM, PROC_STOP_FORCE);
233933
+                    glusterd_unlink_file(svc->proc.pidfile);
233933
                 }
233933
                 mux_proc = __gf_find_compatible_svc(GD_NODE_SHD);
233933
             }
233933
-- 
233933
1.8.3.1
233933