Repository: kafka Updated Branches: refs/heads/0.11.0 0827d2129 -> 076eefcc6
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 <apu...@confluent.io> Reviewers: Jason Gustafson <ja...@confluent.io> Closes #3308 from apurvam/KAFKA-5437-force-kill-message-copier-on-cleanup (cherry picked from commit 0f3f2f56a2d013e6ff723155607b2f71b20db620) Signed-off-by: Jason Gustafson <ja...@confluent.io> Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/076eefcc Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/076eefcc Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/076eefcc Branch: refs/heads/0.11.0 Commit: 076eefcc639404354434a6fceb097072fafd9200 Parents: 0827d21 Author: Apurva Mehta <apu...@confluent.io> Authored: Mon Jun 12 15:57:01 2017 -0700 Committer: Jason Gustafson <ja...@confluent.io> Committed: Mon Jun 12 15:57:30 2017 -0700 ---------------------------------------------------------------------- tests/kafkatest/services/transactional_message_copier.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/076eefcc/tests/kafkatest/services/transactional_message_copier.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/transactional_message_copier.py b/tests/kafkatest/services/transactional_message_copier.py index 14bafa7..01d124b 100644 --- a/tests/kafkatest/services/transactional_message_copier.py +++ b/tests/kafkatest/services/transactional_message_copier.py @@ -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)
