Repository: storm Updated Branches: refs/heads/1.1.x-branch ff3ab9963 -> ed005ab5f
STORM-2811: Fix integration test killing the same topology multiple times Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ccfdd440 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ccfdd440 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ccfdd440 Branch: refs/heads/1.1.x-branch Commit: ccfdd4402e591f72948a4bc70f26b6b9452decc7 Parents: ff3ab99 Author: Stig Rohde Døssing <[email protected]> Authored: Sun Nov 12 10:11:49 2017 +0100 Committer: Jungtaek Lim <[email protected]> Committed: Tue Nov 14 08:27:14 2017 +0900 ---------------------------------------------------------------------- integration-test/src/test/java/org/apache/storm/st/DemoTest.java | 1 + .../java/org/apache/storm/st/tests/window/SlidingWindowTest.java | 1 + .../java/org/apache/storm/st/tests/window/TumblingWindowTest.java | 3 ++- .../src/test/java/org/apache/storm/st/wrapper/StormCluster.java | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ccfdd440/integration-test/src/test/java/org/apache/storm/st/DemoTest.java ---------------------------------------------------------------------- diff --git a/integration-test/src/test/java/org/apache/storm/st/DemoTest.java b/integration-test/src/test/java/org/apache/storm/st/DemoTest.java index 2c62d3f..133014b 100644 --- a/integration-test/src/test/java/org/apache/storm/st/DemoTest.java +++ b/integration-test/src/test/java/org/apache/storm/st/DemoTest.java @@ -80,6 +80,7 @@ public final class DemoTest extends AbstractTest { public void cleanup() throws Exception { if (topo != null) { topo.killOrThrow(); + topo = null; } } } http://git-wip-us.apache.org/repos/asf/storm/blob/ccfdd440/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java ---------------------------------------------------------------------- diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java index 29afe7a..f23c6fc 100644 --- a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java +++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java @@ -182,6 +182,7 @@ public final class SlidingWindowTest extends AbstractTest { public void cleanup() throws Exception { if (topo != null) { topo.killOrThrow(); + topo = null; } } } http://git-wip-us.apache.org/repos/asf/storm/blob/ccfdd440/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java ---------------------------------------------------------------------- diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java index 866e4c8..28b3969 100644 --- a/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java +++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java @@ -30,7 +30,7 @@ import org.testng.annotations.Test; public final class TumblingWindowTest extends AbstractTest { private static Logger log = LoggerFactory.getLogger(TumblingWindowTest.class); - TopoWrap topo; + private TopoWrap topo; @DataProvider public static Object[][] generateWindows() { @@ -94,6 +94,7 @@ public final class TumblingWindowTest extends AbstractTest { public void cleanup() throws Exception { if (topo != null) { topo.killOrThrow(); + topo = null; } } } http://git-wip-us.apache.org/repos/asf/storm/blob/ccfdd440/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java ---------------------------------------------------------------------- diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java index 51226e1..8a82589 100644 --- a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java +++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java @@ -93,7 +93,7 @@ public class StormCluster { client.killTopologyWithOpts(topologyName, killOptions); log.info("Topology killed: " + topologyName); return; - } catch (Throwable e) { + } catch (TException e) { log.warn("Couldn't kill topology: " + topologyName + ", going to retry soon. Exception: " + ExceptionUtils.getFullStackTrace(e)); Thread.sleep(TimeUnit.SECONDS.toMillis(2)); }
