ctdbd: Kill client process without checking for tracked child
authorMartin Schwenke <martin@meltin.net>
Thu, 25 Jul 2013 06:17:07 +0000 (16:17 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Mon, 29 Jul 2013 05:58:51 +0000 (15:58 +1000)
Commit f73a4b1495830bcdd094a93732a89dd53b3c2f78 added a safety check
to ensure that CTDB never kills unrelated processes.  However, client
processes are unrelated.

Signed-off-by: Martin Schwenke <martin@meltin.net>
server/ctdb_takeover.c

index 9a2f8f020e2c0f1f869b70b54871f3707a1a24d3..82fecfc4f2875bfd1c07af9875df00f9678ae1bd 100644 (file)
@@ -861,7 +861,7 @@ static void release_kill_clients(struct ctdb_context *ctdb, ctdb_sock_addr *addr
                                        (unsigned)client->pid,
                                        ctdb_addr_to_str(addr),
                                        ip->client_id));
-                               ctdb_kill(ctdb, client->pid, SIGKILL);
+                               kill(client->pid, SIGKILL);
                        }
                }
        }