You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/04/12 08:29:15 UTC

[07/10] storm git commit: STORM-2447: Fixed compilation issue with int test

STORM-2447: Fixed compilation issue with int test


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9eced531
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9eced531
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9eced531

Branch: refs/heads/master
Commit: 9eced5310464f87ca52eb92b6224ef5abe531514
Parents: b254ede
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Apr 6 14:50:14 2017 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Apr 6 14:50:14 2017 -0500

----------------------------------------------------------------------
 .../java/org/apache/storm/ExclamationTopology.java  | 16 ++++++----------
 .../org/apache/storm/st/wrapper/StormCluster.java   |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9eced531/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
----------------------------------------------------------------------
diff --git a/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java b/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
index 79f2ba3..372ee56 100644
--- a/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
+++ b/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
@@ -18,7 +18,6 @@
 package org.apache.storm;
 
 import org.apache.storm.generated.StormTopology;
-import org.apache.storm.LocalCluster.LocalTopology;
 import org.apache.storm.task.OutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.testing.TestWordSpout;
@@ -66,16 +65,13 @@ public class ExclamationTopology {
 
     Config conf = new Config();
     conf.setDebug(true);
-
-    if (args != null && args.length > 0) {
-      conf.setNumWorkers(3);
-      StormSubmitter.submitTopologyWithProgressBar(args[0], conf, topology);
-    } else {
-      try (LocalCluster cluster = new LocalCluster();
-           LocalTopology topo = cluster.submitTopology("test", conf, topology);) {
-        Utils.sleep(10000);
-      }
+    String topoName = "test";
+    if (args.length > 0) {
+        topoName = args[0];
     }
+
+    conf.setNumWorkers(3);
+    StormSubmitter.submitTopologyWithProgressBar(topoName, conf, topology);
   }
 
   public static StormTopology getStormTopology() {

http://git-wip-us.apache.org/repos/asf/storm/blob/9eced531/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 f97a259..6d6f940 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
@@ -41,7 +41,7 @@ import java.util.Map;
 
 public class StormCluster {
     private static Logger log = LoggerFactory.getLogger(StormCluster.class);
-    private final Nimbus.Client client;
+    private final Nimbus.Iface client;
 
     public StormCluster() {
         Map conf = getConfig();
@@ -103,7 +103,7 @@ public class StormCluster {
         return client.getTopologyInfo(topologySummary.get_id());
     }
 
-    public Nimbus.Client getNimbusClient() {
+    public Nimbus.Iface getNimbusClient() {
         return client;
     }