Repository: storm Updated Branches: refs/heads/1.x-branch 93637a3e6 -> f9780140f
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/e7b7a01b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e7b7a01b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e7b7a01b Branch: refs/heads/1.x-branch Commit: e7b7a01b560e4edf118a62189ebce067f3192b57 Parents: 93637a3 Author: Stig Rohde Døssing <[email protected]> Authored: Mon May 2 15:07:07 2016 +0200 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 18:00:28 2016 +0900 ---------------------------------------------------------------------- .../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/e7b7a01b/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(); }
