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/10/25 15:39:32 UTC
[1/3] storm git commit: STORM-2145 Leave leader nimbus's hostname to
log when trying to connect leader nimbus
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch f34b47656 -> 5a31a4ad6
STORM-2145 Leave leader nimbus's hostname to log when trying to connect leader nimbus
* leave a log regarding leader Nimbus connection information when connecting to leader Nimbus
* also leave a log when Nimbus figures out its hostname without using 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/4caa3b81
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4caa3b81
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4caa3b81
Branch: refs/heads/1.0.x-branch
Commit: 4caa3b81d51f35b58ed8bf1cd9273fc01180b5e9
Parents: f34b476
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Oct 10 20:48:54 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Oct 26 00:37:44 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java | 2 ++
storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4caa3b81/storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java b/storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java
index 091a7cd..c933c31 100644
--- a/storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java
+++ b/storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java
@@ -55,6 +55,8 @@ public class NimbusInfo implements Serializable {
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);
+ } else {
+ LOG.info("Nimbus figures out its name to {}", host);
}
int port = Integer.parseInt(conf.get(Config.NIMBUS_THRIFT_PORT).toString());
http://git-wip-us.apache.org/repos/asf/storm/blob/4caa3b81/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
index 456b459..44ae70e 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -73,10 +73,12 @@ public class NimbusClient extends ThriftClient {
if (nimbuses != null) {
for (NimbusSummary nimbusSummary : nimbuses) {
if (nimbusSummary.is_isLeader()) {
+ String leaderNimbus = nimbusSummary.get_host() + ":" + nimbusSummary.get_port();
+ LOG.info("Found leader nimbus : {}", leaderNimbus);
+
try {
return new NimbusClient(conf, nimbusSummary.get_host(), nimbusSummary.get_port(), null, asUser);
} catch (TTransportException e) {
- String leaderNimbus = nimbusSummary.get_host() + ":" + nimbusSummary.get_port();
throw new RuntimeException("Failed to create a nimbus client for the leader " + leaderNimbus, e);
}
}
[3/3] storm git commit: add STORM-2145 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2145 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5a31a4ad
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5a31a4ad
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5a31a4ad
Branch: refs/heads/1.0.x-branch
Commit: 5a31a4ad6ff7d749de302b4d90f6c2aeeb925117
Parents: c4bd79c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Oct 26 00:39:17 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Oct 26 00:39:17 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5a31a4ad/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index caa8e3f..66c0e7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2145: Leave leader nimbus's hostname to log when trying to connect leader nimbus
* STORM-2127: Storm-eventhubs should use latest amqp and eventhubs-client versions
* STORM-2040: Fix bug on assert-can-serialize
* STORM-2017: ShellBolt stops reporting task ids
[2/3] storm git commit: Merge branch 'STORM-2145-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2145-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c4bd79ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c4bd79ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c4bd79ce
Branch: refs/heads/1.0.x-branch
Commit: c4bd79cee021ce1c6bb2d2c9e2e8b6afea0b96b2
Parents: f34b476 4caa3b8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Oct 26 00:39:00 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Oct 26 00:39:00 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/nimbus/NimbusInfo.java | 2 ++
storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------