From 76776317825cee0cec715bd5558d091bdbc0fcdf Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Tue, 9 May 2017 07:05:18 +0530 Subject: 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 >CentOS-regression: Gluster Build System >Reviewed-by: Pranith Kumar Karampuri >Smoke: Gluster Build System >(cherry picked from commit 4f4ad03e0c4739d3fe1b0640ab8b4e1ffc985374) Change-Id: I856df607b7109a215f2a2a4827ba3ea42d8a9729 BUG: 1449004 Signed-off-by: Atin Mukherjee Reviewed-on: https://review.gluster.org/17260 Smoke: Gluster Build System Reviewed-by: MOHIT AGRAWAL NetBSD-regression: NetBSD Build System Reviewed-by: Prashanth Pai CentOS-regression: Gluster Build System Reviewed-by: Shyamsundar Ranganathan --- xlators/storage/posix/src/posix-helpers.c | 4 ++-- 1 file 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); } -- cgit