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 2016/09/23 01:59:23 UTC
[1/4] storm git commit: STORM-1664: Allow Java users to start a local
cluster with a Nimbus Thrift server
Repository: storm
Updated Branches:
refs/heads/1.x-branch 8cb227445 -> 14595f385
STORM-1664: Allow Java users to start a local cluster with a Nimbus Thrift server
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d398bde1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d398bde1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d398bde1
Branch: refs/heads/1.x-branch
Commit: d398bde1fdaa439b231e84d9e444a8c38beecb26
Parents: 8cb2274
Author: Stig D�ssing <sd...@it-minds.dk>
Authored: Tue Mar 29 18:58:45 2016 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:58:30 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/testing4j.clj | 6 ++++--
.../jvm/org/apache/storm/testing/MkClusterParam.java | 14 +++++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d398bde1/storm-core/src/clj/org/apache/storm/testing4j.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/testing4j.clj b/storm-core/src/clj/org/apache/storm/testing4j.clj
index 5850262..a0bbf3c 100644
--- a/storm-core/src/clj/org/apache/storm/testing4j.clj
+++ b/storm-core/src/clj/org/apache/storm/testing4j.clj
@@ -79,10 +79,12 @@
[cluster-type mkClusterParam code]
`(let [supervisors# (or (.getSupervisors ~mkClusterParam) 2)
ports-per-supervisor# (or (.getPortsPerSupervisor ~mkClusterParam) 3)
- daemon-conf# (or (.getDaemonConf ~mkClusterParam) {})]
+ daemon-conf# (or (.getDaemonConf ~mkClusterParam) {})
+ nimbus-daemon# (or (.isNimbusDaemon ~mkClusterParam) false)]
(~cluster-type [cluster# :supervisors supervisors#
:ports-per-supervisor ports-per-supervisor#
- :daemon-conf daemon-conf#]
+ :daemon-conf daemon-conf#
+ :nimbus-daemon nimbus-daemon#]
(let [cluster# (LocalCluster. cluster#)]
(.run ~code cluster#)))))
http://git-wip-us.apache.org/repos/asf/storm/blob/d398bde1/storm-core/src/jvm/org/apache/storm/testing/MkClusterParam.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/testing/MkClusterParam.java b/storm-core/src/jvm/org/apache/storm/testing/MkClusterParam.java
index 08459cb..c3946fa 100644
--- a/storm-core/src/jvm/org/apache/storm/testing/MkClusterParam.java
+++ b/storm-core/src/jvm/org/apache/storm/testing/MkClusterParam.java
@@ -20,7 +20,7 @@ package org.apache.storm.testing;
import java.util.Map;
/**
- * The param arg for `Testing.withSimulatedTimeCluster` and `Testing.withTrackedCluster`
+ * The param arg for `Testing.withSimulatedTimeCluster`, `Testing.withTrackedCluster` and `Testing.withLocalCluster`
*/
public class MkClusterParam {
/**
@@ -35,6 +35,8 @@ public class MkClusterParam {
* cluster config
*/
private Map daemonConf;
+
+ private Boolean nimbusDaemon;
public Integer getSupervisors() {
return supervisors;
@@ -45,6 +47,9 @@ public class MkClusterParam {
public Integer getPortsPerSupervisor() {
return portsPerSupervisor;
}
+ public Boolean isNimbusDaemon() {
+ return nimbusDaemon;
+ }
public void setPortsPerSupervisor(Integer portsPerSupervisor) {
this.portsPerSupervisor = portsPerSupervisor;
}
@@ -54,4 +59,11 @@ public class MkClusterParam {
public void setDaemonConf(Map daemonConf) {
this.daemonConf = daemonConf;
}
+ /**
+ * When nimbusDaemon is true, the local cluster will be started with a Nimbus
+ * Thrift server, allowing communication through for example org.apache.storm.utils.NimbusClient
+ */
+ public void setNimbusDaemon(Boolean nimbusDaemon) {
+ this.nimbusDaemon = nimbusDaemon;
+ }
}
[3/4] storm git commit: Merge branch 'STORM-1664-1.x' into 1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-1664-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/afc67ff0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/afc67ff0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/afc67ff0
Branch: refs/heads/1.x-branch
Commit: afc67ff017b61fd48bcad0b21b03a478bd018f02
Parents: 8cb2274 9bff5f4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 23 10:58:49 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:58:49 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/testing4j.clj | 6 ++++--
.../jvm/org/apache/storm/testing/MkClusterParam.java | 14 +++++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/4] storm git commit: add STORM-1664 to CHANGELOG
Posted by ka...@apache.org.
add STORM-1664 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14595f38
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14595f38
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14595f38
Branch: refs/heads/1.x-branch
Commit: 14595f38568cadd04944282f590fa39995f59f6c
Parents: afc67ff
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 23 10:59:12 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:59:12 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/14595f38/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18a53fb..d65400c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.0
+ * STORM-1664: Allow Java users to start a local cluster with a Nimbus Thrift server.
* STORM-1872: Release Jedis connection when topology shutdown
* STORM-2100: Fix Trident SQL join tests to not rely on ordering
* STORM-1837: Fix complete-topology and prevent message loss
[2/4] storm git commit: STORM-1664: Remove unnecessary or
Posted by ka...@apache.org.
STORM-1664: Remove unnecessary or
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9bff5f42
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9bff5f42
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9bff5f42
Branch: refs/heads/1.x-branch
Commit: 9bff5f429102b3233ed4195e12f5fecf346212c7
Parents: d398bde
Author: Stig Rohde D�ssing <st...@gmail.com>
Authored: Wed Mar 30 22:13:52 2016 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:58:35 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/testing4j.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9bff5f42/storm-core/src/clj/org/apache/storm/testing4j.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/testing4j.clj b/storm-core/src/clj/org/apache/storm/testing4j.clj
index a0bbf3c..b2acffc 100644
--- a/storm-core/src/clj/org/apache/storm/testing4j.clj
+++ b/storm-core/src/clj/org/apache/storm/testing4j.clj
@@ -80,7 +80,7 @@
`(let [supervisors# (or (.getSupervisors ~mkClusterParam) 2)
ports-per-supervisor# (or (.getPortsPerSupervisor ~mkClusterParam) 3)
daemon-conf# (or (.getDaemonConf ~mkClusterParam) {})
- nimbus-daemon# (or (.isNimbusDaemon ~mkClusterParam) false)]
+ nimbus-daemon# (.isNimbusDaemon ~mkClusterParam)]
(~cluster-type [cluster# :supervisors supervisors#
:ports-per-supervisor ports-per-supervisor#
:daemon-conf daemon-conf#