KAFKA-5437; Always send a sig_kill when cleaning the message copier

When the message copier hangs (like when there is a bug in the client), it ignores the sigterm and doesn't shut down. this leaves the cluster in an unclean state causing future tests to fail.

In this patch we always send SIGKILL when cleaning the node if the process isn't already dead. This is consistent with the other services.

Author: Apurva Mehta <apurva@confluent.io>

Reviewers: Jason Gustafson <jason@confluent.io>

Closes #3308 from apurvam/KAFKA-5437-force-kill-message-copier-on-cleanup
This commit is contained in:
Apurva Mehta 2017-06-12 15:57:01 -07:00 committed by Jason Gustafson
parent 43e935a630
commit 0f3f2f56a2
1 changed files with 2 additions and 2 deletions

View File

@ -123,8 +123,8 @@ class TransactionalMessageCopier(KafkaPathResolverMixin, BackgroundThreadService
return cmd
def clean_node(self, node, clean_shutdown=True):
self.kill_node(node, clean_shutdown)
def clean_node(self, node):
self.kill_node(node, clean_shutdown=False)
node.account.ssh("rm -rf " + self.PERSISTENT_ROOT, allow_fail=False)
self.security_config.clean_node(node)