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 2018/01/24 05:30:39 UTC
[1/2] storm git commit: fix BlobSynchronizer zk-client non set
Repository: storm
Updated Branches:
refs/heads/master e6a423dd8 -> fc4ac8e2a
fix BlobSynchronizer zk-client non set
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/326afbe6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/326afbe6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/326afbe6
Branch: refs/heads/master
Commit: 326afbe6288046a89254a089e9384930ca76713c
Parents: 879cb5b
Author: chenyuzhao <ch...@meituan.com>
Authored: Mon Jan 22 22:29:57 2018 +0800
Committer: chenyuzhao <ch...@meituan.com>
Committed: Mon Jan 22 22:29:57 2018 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/326afbe6/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index afb1c28..5a0f622 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -2283,6 +2283,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
sync.setNimbusInfo(nimbusInfo);
sync.setBlobStoreKeySet(allKeys);
sync.setZookeeperKeySet(zkKeys);
+ sync.setZkClient(zkClient);
sync.syncBlobs();
} //else not leader (NOOP)
} //else local (NOOP)
[2/2] storm git commit: Merge branch 'fix-blob' of
https://github.com/danny0405/storm into STORM-2901-FU-merge
Posted by ka...@apache.org.
Merge branch 'fix-blob' of https://github.com/danny0405/storm into STORM-2901-FU-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc4ac8e2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc4ac8e2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc4ac8e2
Branch: refs/heads/master
Commit: fc4ac8e2a950a7f5e3447a29e395d325486a4698
Parents: e6a423d 326afbe
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jan 24 14:30:31 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jan 24 14:30:31 2018 +0900
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fc4ac8e2/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------