Repository: storm Updated Branches: refs/heads/master a46bc068a -> 7f0403868
STORM-1756: Explicitly null KafkaServer reference in KafkaTestBroker to prevent out of memory on large test classes Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0f760c20 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0f760c20 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0f760c20 Branch: refs/heads/master Commit: 0f760c20f2a5d1376d20f1dcb259bdb000cc1d35 Parents: a536937 Author: Stig Rohde Døssing <[email protected]> Authored: Mon May 2 15:07:07 2016 +0200 Committer: Stig Rohde Døssing <[email protected]> Committed: Mon May 2 15:07:07 2016 +0200 ---------------------------------------------------------------------- .../src/test/org/apache/storm/kafka/KafkaTestBroker.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/0f760c20/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaTestBroker.java ---------------------------------------------------------------------- diff --git a/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaTestBroker.java b/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaTestBroker.java index e2fb60f..90c56e6 100644 --- a/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaTestBroker.java +++ b/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaTestBroker.java @@ -78,7 +78,12 @@ public class KafkaTestBroker { return port; } public void shutdown() { - kafka.shutdown(); + if (kafka != null) { + kafka.shutdown(); + kafka.awaitShutdown(); + } + //Ensure kafka server is eligible for garbage collection immediately + kafka = null; if (zookeeper.getState().equals(CuratorFrameworkState.STARTED)) { zookeeper.close(); }
