git.samba.org
/
obnox
/
ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
edbc8a6
)
locking: Do not use ctdb_kill() to kill smbd processes
author
Amitay Isaacs
<amitay@gmail.com>
Tue, 25 Sep 2012 07:29:50 +0000
(17:29 +1000)
committer
Amitay Isaacs
<amitay@gmail.com>
Fri, 19 Oct 2012 15:48:45 +0000
(
02:48
+1100)
ctdb_kill() is used to terminate processes spawned by CTDB.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
server/ctdb_lock.c
patch
|
blob
|
history
diff --git
a/server/ctdb_lock.c
b/server/ctdb_lock.c
index fd91c63e890f514513f44356b5711f39637b6ebf..8097e84b3bb456d101852984c430ccd0a4f4bb41 100644
(file)
--- a/
server/ctdb_lock.c
+++ b/
server/ctdb_lock.c
@@
-1058,7
+1058,7
@@
void ctdb_lock_blocked_handler(struct tevent_context *ev,
process_name && strstr(process_name, "smbd")) {
DEBUG(DEBUG_WARNING,
("Deadlock detected. Killing smbd process (pid=%d)", blocker_pid));
-
ctdb_kill(lock_ctx->ctdb,
blocker_pid, SIGKILL);
+
kill(
blocker_pid, SIGKILL);
}
free(process_name);