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 <mich...@schonfeld.org> Authored: Tue Oct 6 19:31:03 2015 +0300 Committer: Michael Schonfeld <mich...@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);
