You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/11/20 19:01:23 UTC
[37/50] [abbrv] storm git commit: STORM-2811: Fix integration test
killing the same topology multiple times
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/bbd582b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bbd582b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bbd582b8
Branch: refs/heads/metrics_v2
Commit: bbd582b80716bb8d4782a3f3b9f93123fd9af9ff
Parents: 7e17712
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sun Nov 12 10:11:49 2017 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon Nov 13 19:48:47 2017 +0100
----------------------------------------------------------------------
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/bbd582b8/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/bbd582b8/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 da65ca5..ebb844f 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
@@ -188,6 +188,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/bbd582b8/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/bbd582b8/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));
}