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/09/19 03:46:40 UTC
[1/3] storm git commit: fix same name topologies bug
Repository: storm
Updated Branches:
refs/heads/master fc398c6a2 -> 2bb41a95e
fix same name topologies bug
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a99fae0f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a99fae0f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a99fae0f
Branch: refs/heads/master
Commit: a99fae0fa0aeb8922ce6cb36962b03bc79210730
Parents: 0a5426e
Author: chenyuzhao <ch...@meituan.com>
Authored: Wed Sep 16 16:05:02 2015 +0800
Committer: chenyuzhao <ch...@meituan.com>
Committed: Wed Sep 16 16:05:02 2015 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a99fae0f/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 3ee4cdc..c0406d2 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1181,6 +1181,7 @@
;; lock protects against multiple topologies being submitted at once and
;; cleanup thread killing topology in b/w assignment and starting the topology
(locking (:submit-lock nimbus)
+ (check-storm-active! nimbus storm-name false)
;;cred-update-lock is not needed here because creds are being added for the first time.
(.set-credentials! storm-cluster-state storm-id credentials storm-conf)
(setup-storm-code nimbus conf storm-id uploadedJarLocation storm-conf topology)
[3/3] storm git commit: add STORM-1050 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1050 to CHANGELOG.md
* also add chenyuzhao to contributor list
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2bb41a95
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2bb41a95
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2bb41a95
Branch: refs/heads/master
Commit: 2bb41a95ec9f20f6cbb11176d0c156bb9ecffa99
Parents: 1a44080
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 19 10:44:30 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 19 10:44:30 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2bb41a95/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d85ead7..9d1e66e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
* STORM-949: On the topology summary UI page, last shown error should have the time and date
## 0.10.0-beta2
+ * STORM-1050: Topologies with same name run on one cluster
* STORM-1005: Supervisor do not get running workers after restart.
* STORM-803: Better CI logs
* STORM-1027: Use overflow buffer for emitting metrics
http://git-wip-us.apache.org/repos/asf/storm/blob/2bb41a95/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 6bb8370..2eb5149 100644
--- a/README.markdown
+++ b/README.markdown
@@ -227,6 +227,7 @@ under the License.
* Aaron Coburn ([@acoburn](https://github.com/acoburn))
* Rick Kellogg ([@rmkellogg](https://github.com/rmkellogg))
* Abhishek Agarwal ([@abhishekagarwal87](https://github.com/abhishekagarwal87))
+* chenyuzhao ([@danny0405](https://github.com/danny0405))
## Acknowledgements
[2/3] storm git commit: Merge branch 'cyz-dev' of
https://github.com/danny0405/storm into STORM-1050
Posted by ka...@apache.org.
Merge branch 'cyz-dev' of https://github.com/danny0405/storm into STORM-1050
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a440808
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a440808
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a440808
Branch: refs/heads/master
Commit: 1a440808fb13df87d7e9f70b00cb567043112096
Parents: fc398c6 a99fae0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 19 10:34:23 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 19 10:34:23 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1a440808/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------