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 2015/10/09 09:08:10 UTC
[1/3] storm git commit: nimbus host should support
Config.STORM_LOCAL_HOSTNAME
Repository: storm
Updated Branches:
refs/heads/master 1af33c7c7 -> 8c17b74f4
nimbus host should support Config.STORM_LOCAL_HOSTNAME
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ed7b4869
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed7b4869
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed7b4869
Branch: refs/heads/master
Commit: ed7b4869d3cfd53279d34bf300abdf6fb50958b6
Parents: 4c2b37c
Author: Michael Schonfeld <mi...@schonfeld.org>
Authored: Tue Oct 6 19:31:03 2015 +0300
Committer: Michael Schonfeld <mi...@schonfeld.org>
Committed: Tue Oct 6 19:31:03 2015 +0300
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ed7b4869/storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java b/storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java
index bf56e2d..d9af2a4 100644
--- a/storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java
+++ b/storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java
@@ -1,6 +1,8 @@
package backtype.storm.nimbus;
import backtype.storm.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.net.InetAddress;
@@ -8,6 +10,7 @@ import java.net.UnknownHostException;
import java.util.Map;
public class NimbusInfo implements Serializable {
+ private static final Logger LOG = LoggerFactory.getLogger(NimbusInfo.class);
private static final String DELIM = ":";
private String host;
@@ -32,6 +35,11 @@ public class NimbusInfo implements Serializable {
public static NimbusInfo fromConf(Map conf) {
try {
String host = InetAddress.getLocalHost().getCanonicalHostName();
+ if (conf.containsKey(Config.STORM_LOCAL_HOSTNAME)) {
+ host = conf.get(Config.STORM_LOCAL_HOSTNAME).toString();
+ LOG.info("Overriding nimbus host to storm.local.hostname -> {}", host);
+ }
+
int port = Integer.parseInt(conf.get(Config.NIMBUS_THRIFT_PORT).toString());
return new NimbusInfo(host, port, false);
[3/3] storm git commit: add STORM-1090 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1090 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8c17b74f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c17b74f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c17b74f
Branch: refs/heads/master
Commit: 8c17b74f4377219174460debdeb9492a2e90f3e4
Parents: 9e7d8be
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Oct 9 16:07:42 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Oct 9 16:07:42 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8c17b74f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca5b527..c6ee110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1090: Nimbus HA should support `storm.local.hostname`
* STORM-820: Aggregate topo stats on nimbus, not ui
* STORM-412: Allow users to modify logging levels of running topologies
* STORM-1078: Updated RateTracker to be thread safe
[2/3] storm git commit: Merge branch
'nimbus-ha-support-storm-local-hostname' of
https://github.com/schonfeld/storm into STORM-1090
Posted by ka...@apache.org.
Merge branch 'nimbus-ha-support-storm-local-hostname' of https://github.com/schonfeld/storm into STORM-1090
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9e7d8be6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9e7d8be6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9e7d8be6
Branch: refs/heads/master
Commit: 9e7d8be68df68cc7dd4f4c560350dcf9a64b2835
Parents: 1af33c7 ed7b486
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Oct 9 16:06:31 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Oct 9 16:06:31 2015 +0900
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/nimbus/NimbusInfo.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------