|
 |
9ae3f9 |
From d23859d5cbd5823b2587811aa57030436ce9e74c Mon Sep 17 00:00:00 2001
|
|
|
9ae3f9 |
From: Sanju Rakonde <srakonde@redhat.com>
|
|
|
9ae3f9 |
Date: Tue, 17 Dec 2019 15:52:30 +0530
|
|
|
9ae3f9 |
Subject: [PATCH 391/449] glusterd: unlink the file after killing the process
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
In glusterd_proc_stop(), after killing the pid
|
|
|
9ae3f9 |
we should remove the pidfile.
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23890/
|
|
|
9ae3f9 |
> fixes: bz#1784375
|
|
|
9ae3f9 |
> Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686
|
|
|
9ae3f9 |
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
BUG: 1784211
|
|
|
9ae3f9 |
Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686
|
|
|
9ae3f9 |
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
9ae3f9 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/202257
|
|
|
9ae3f9 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
9ae3f9 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
9ae3f9 |
---
|
|
|
9ae3f9 |
xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | 2 ++
|
|
|
9ae3f9 |
1 file changed, 2 insertions(+)
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c
|
|
|
9ae3f9 |
index f55a5fd..a05c90d 100644
|
|
|
9ae3f9 |
--- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c
|
|
|
9ae3f9 |
+++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c
|
|
|
9ae3f9 |
@@ -107,6 +107,8 @@ glusterd_proc_stop(glusterd_proc_t *proc, int sig, int flags)
|
|
|
9ae3f9 |
"service, reason:%s",
|
|
|
9ae3f9 |
proc->name, strerror(errno));
|
|
|
9ae3f9 |
}
|
|
|
9ae3f9 |
+ } else {
|
|
|
9ae3f9 |
+ (void)glusterd_unlink_file(proc->pidfile);
|
|
|
9ae3f9 |
}
|
|
|
9ae3f9 |
if (flags != PROC_STOP_FORCE)
|
|
|
9ae3f9 |
goto out;
|
|
|
9ae3f9 |
--
|
|
|
9ae3f9 |
1.8.3.1
|
|
|
9ae3f9 |
|