You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/01/10 18:31:08 UTC
[1/2] storm git commit: STORM-2885: Avoid conflicts with nimbusDaemon
LocalCluster Tests
Repository: storm
Updated Branches:
refs/heads/master b25d297ad -> 6d43128de
STORM-2885: Avoid conflicts with nimbusDaemon LocalCluster Tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8f70777b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8f70777b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8f70777b
Branch: refs/heads/master
Commit: 8f70777bee43d8add02d659d689076c15540976c
Parents: 7ecb3d7
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 8 13:21:44 2018 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 8 13:21:44 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/TickTupleTest.java | 2 +-
.../apache/storm/nimbus/LocalNimbusTest.java | 56 ++++++++++----------
2 files changed, 28 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8f70777b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
index 65d2529..a498a23 100644
--- a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
+++ b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
@@ -48,7 +48,7 @@ public class TickTupleTest {
@Test
public void testTickTupleWorksWithSystemBolt() throws Exception {
- try (ILocalCluster cluster = new LocalCluster.Builder().withSimulatedTime().withNimbusDaemon(true).build()){
+ try (ILocalCluster cluster = new LocalCluster.Builder().withSimulatedTime().build()){
StormTopology topology = createNoOpTopology();
Config topoConf = new Config();
topoConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, 1);
http://git-wip-us.apache.org/repos/asf/storm/blob/8f70777b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
index 4a1152e..64306a2 100644
--- a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
+++ b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
@@ -18,10 +18,15 @@
*/
package org.apache.storm.nimbus;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
import org.apache.storm.Config;
import org.apache.storm.ILocalCluster;
import org.apache.storm.ISubmitterHook;
-import org.apache.storm.Testing;
+import org.apache.storm.LocalCluster;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.generated.TopologyInfo;
import org.apache.storm.testing.TestGlobalCount;
@@ -32,13 +37,6 @@ import org.apache.storm.utils.Utils;
import org.junit.Assert;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
/**
* Tests local cluster with nimbus and a plugin for {@link Config#STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN}.
*/
@@ -46,28 +44,28 @@ public class LocalNimbusTest {
@Test
public void testSubmitTopologyToLocalNimbus() throws Exception {
-
- HashMap<String,Object> localClusterConf = new HashMap<>();
- localClusterConf.put("nimbus-daemon", true);
- ILocalCluster localCluster = Testing.getLocalCluster(localClusterConf);
-
- Config topoConf = new Config();
- topoConf.putAll(Utils.readDefaultConfig());
- topoConf.setDebug(true);
- topoConf.put("storm.cluster.mode", "local"); // default is aways "distributed" but here local cluster is being used.
- topoConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN, InmemoryTopologySubmitterHook.class.getName());
-
- List<TopologyDetails> topologyNames =new ArrayList<>();
- for (int i=0; i<4; i++) {
- final String topologyName = "word-count-"+ UUID.randomUUID().toString();
- final StormTopology stormTopology = createTestTopology();
- topologyNames.add(new TopologyDetails(topologyName, stormTopology));
- localCluster.submitTopology(topologyName, topoConf, stormTopology);
+ int port = Utils.getAvailablePort();
+ try (ILocalCluster localCluster = new LocalCluster.Builder()
+ .withNimbusDaemon(true)
+ .withDaemonConf(Config.NIMBUS_THRIFT_PORT, port)
+ .build()) {
+ Config topoConf = new Config();
+ topoConf.putAll(Utils.readDefaultConfig());
+ topoConf.setDebug(true);
+ topoConf.put("storm.cluster.mode", "local"); // default is aways "distributed" but here local cluster is being used.
+ topoConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN, InmemoryTopologySubmitterHook.class.getName());
+ topoConf.put(Config.NIMBUS_THRIFT_PORT, port);
+
+ List<TopologyDetails> topologyNames = new ArrayList<>();
+ for (int i = 0; i < 4; i++) {
+ final String topologyName = "word-count-" + UUID.randomUUID().toString();
+ final StormTopology stormTopology = createTestTopology();
+ topologyNames.add(new TopologyDetails(topologyName, stormTopology));
+ localCluster.submitTopology(topologyName, topoConf, stormTopology);
+ }
+
+ Assert.assertEquals(InmemoryTopologySubmitterHook.submittedTopologies, topologyNames);
}
-
- Assert.assertEquals(InmemoryTopologySubmitterHook.submittedTopologies, topologyNames);
-
- localCluster.shutdown();
}
public static StormTopology createTestTopology() {
[2/2] storm git commit: Merge branch 'STORM-2885' of
https://github.com/revans2/incubator-storm into STORM-2885
Posted by bo...@apache.org.
Merge branch 'STORM-2885' of https://github.com/revans2/incubator-storm into STORM-2885
STORM-2885: Avoid conflicts with nimbusDaemon LocalCluster Tests
This closes #2507
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d43128d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d43128d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d43128d
Branch: refs/heads/master
Commit: 6d43128de81b440262ce701f6e7ba14e95f39ab9
Parents: b25d297 8f70777
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 10 12:03:16 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 10 12:03:16 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/TickTupleTest.java | 2 +-
.../apache/storm/nimbus/LocalNimbusTest.java | 56 ++++++++++----------
2 files changed, 28 insertions(+), 30 deletions(-)
----------------------------------------------------------------------