From: Martin Schwenke <martin@meltin.net>
Date: Tue, 2 Feb 2016 03:09:50 +0000 (+1100)
Subject: ctdb-recovery: Kill cluster mutex helper with a signal that can be caught
X-Git-Tag: talloc-2.1.7~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b0b954ff23149655640571801e2a3f572ebeadc;p=thirdparty%2Fsamba.git

ctdb-recovery: Kill cluster mutex helper with a signal that can be caught

Unlike fcntl(2), some other helper might need to explicitly take
action to release a mutex.  This can be done by catching SIGTERM.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index da1fc2b9145..8314388930c 100644
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -854,7 +854,7 @@ static int cluster_mutex_destructor(struct ctdb_cluster_mutex_handle *h)
 	if (h->fd[0] != -1) {
 		h->fd[0] = -1;
 	}
-	ctdb_kill(h->ctdb, h->child, SIGKILL);
+	ctdb_kill(h->ctdb, h->child, SIGTERM);
 	return 0;
 }