diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2017-05-09 07:05:18 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-05-12 13:33:29 +0000 |
| commit | 76776317825cee0cec715bd5558d091bdbc0fcdf (patch) | |
| tree | eab0db52292be461dd976ece4aa091b8f5927f69 | |
| parent | 45a5cea1ad028bdff5f33770df8ecdd9ac69b6f1 (diff) | |
posix: Send SIGKILL in 2nd attempt
Commit 21c7f7ba changed the signal from SIGKILL to SIGTERM for the 2nd
attempt to terminate the brick process if SIGTERM fails. This patch
fixes this problem.
>Reviewed-on: https://review.gluster.org/17208
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>(cherry picked from commit 4f4ad03e0c4739d3fe1b0640ab8b4e1ffc985374)
Change-Id: I856df607b7109a215f2a2a4827ba3ea42d8a9729
BUG: 1449004
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://review.gluster.org/17260
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: MOHIT AGRAWAL <moagrawa@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
| -rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index cf6f2fc27ed..3a97da6a79f 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -1915,9 +1915,9 @@ abort: ret = sleep (30); gf_msg (this->name, GF_LOG_EMERG, 0, P_MSG_HEALTHCHECK_FAILED, - "still alive! -> SIGTERM"); + "still alive! -> SIGKILL"); if (ret == 0) - kill (getpid(), SIGTERM); + kill (getpid(), SIGKILL); } |