src/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 4502c270ce11a9b4cff15a31804d7aa200b600d4
Author: David Teigland <teigland(a)redhat.com>
Date: Thu Jan 24 14:09:55 2013 -0600
sanlock: shutdown or rem_lockspace should SIGKILL
rem_lockspace (without UNUSED) or shutdown (with force)
clear any pids using the lockspace. They should go
directly to using SIGKILL instead of attempting to use a
killpath.
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/src/main.c b/src/main.c
index 90436a5..3444f0c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -615,7 +615,9 @@ static void kill_pids(struct space *sp)
in_grace = now < (last_success + id_renewal_fail_seconds + kill_grace_seconds);
- if ((kill_grace_seconds > 0) && in_grace && cl->killpath[0]) {
+ if (sp->external_remove || (external_shutdown > 1)) {
+ sig = SIGKILL;
+ } else if ((kill_grace_seconds > 0) && in_grace &&
cl->killpath[0]) {
sig = SIGRUNPATH;
} else if (in_grace) {
sig = SIGTERM;
Show replies by thread