14e44be7b0
Resolves: bz#1234220 bz#1286171 bz#1487177 bz#1524457 bz#1640573 Resolves: bz#1663557 bz#1667954 bz#1683602 bz#1686897 bz#1721355 Resolves: bz#1748865 bz#1750211 bz#1754391 bz#1759875 bz#1761531 Resolves: bz#1761932 bz#1763124 bz#1763129 bz#1764091 bz#1775637 Resolves: bz#1776901 bz#1781550 bz#1781649 bz#1781710 bz#1783232 Resolves: bz#1784211 bz#1784415 bz#1786516 bz#1786681 bz#1787294 Resolves: bz#1787310 bz#1787331 bz#1787994 bz#1790336 bz#1792873 Resolves: bz#1794663 bz#1796814 bz#1804164 bz#1810924 bz#1815434 Resolves: bz#1836099 bz#1837467 bz#1837926 bz#1838479 bz#1839137 Resolves: bz#1844359 Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From d23859d5cbd5823b2587811aa57030436ce9e74c Mon Sep 17 00:00:00 2001
|
|
From: Sanju Rakonde <srakonde@redhat.com>
|
|
Date: Tue, 17 Dec 2019 15:52:30 +0530
|
|
Subject: [PATCH 391/449] glusterd: unlink the file after killing the process
|
|
|
|
In glusterd_proc_stop(), after killing the pid
|
|
we should remove the pidfile.
|
|
|
|
> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23890/
|
|
> fixes: bz#1784375
|
|
> Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686
|
|
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
|
BUG: 1784211
|
|
Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686
|
|
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/202257
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
---
|
|
xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c
|
|
index f55a5fd..a05c90d 100644
|
|
--- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c
|
|
+++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c
|
|
@@ -107,6 +107,8 @@ glusterd_proc_stop(glusterd_proc_t *proc, int sig, int flags)
|
|
"service, reason:%s",
|
|
proc->name, strerror(errno));
|
|
}
|
|
+ } else {
|
|
+ (void)glusterd_unlink_file(proc->pidfile);
|
|
}
|
|
if (flags != PROC_STOP_FORCE)
|
|
goto out;
|
|
--
|
|
1.8.3.1
|
|
|