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/05/16 10:11:56 UTC
[1/3] storm git commit: STORM-1735: Nimbus should log that
replication succeeded when min replicas was reached exactly
Repository: storm
Updated Branches:
refs/heads/master 38d92e9b9 -> 457a95f30
STORM-1735: Nimbus should log that replication succeeded when min replicas was reached exactly
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4fdb5e1c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4fdb5e1c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4fdb5e1c
Branch: refs/heads/master
Commit: 4fdb5e1c7e83ccb95feabffbbf05b52f584cfce2
Parents: 4ea8840
Author: Stig Rohde D�ssing <sd...@it-minds.dk>
Authored: Wed Apr 27 12:03:43 2016 +0200
Committer: Stig Rohde D�ssing <sd...@it-minds.dk>
Committed: Wed Apr 27 12:20:38 2016 +0200
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4fdb5e1c/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index 743db77..2adadf9 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -518,9 +518,9 @@
(reset! current-replication-count-jar (get-blob-replication-count (ConfigUtils/masterStormJarKey storm-id) nimbus)))
(reset! current-replication-count-code (get-blob-replication-count (ConfigUtils/masterStormCodeKey storm-id) nimbus))
(reset! current-replication-count-conf (get-blob-replication-count (ConfigUtils/masterStormConfKey storm-id) nimbus))))
- (if (and (< min-replication-count @current-replication-count-conf)
- (< min-replication-count @current-replication-count-code)
- (< min-replication-count @current-replication-count-jar))
+ (if (and (<= min-replication-count @current-replication-count-conf)
+ (<= min-replication-count @current-replication-count-code)
+ (<= min-replication-count @current-replication-count-jar))
(log-message "desired replication count " min-replication-count " achieved, "
"current-replication-count for conf key = " @current-replication-count-conf ", "
"current-replication-count for code key = " @current-replication-count-code ", "
[3/3] storm git commit: add STORM-1735 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1735 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/457a95f3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/457a95f3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/457a95f3
Branch: refs/heads/master
Commit: 457a95f3068f8b3a6a62989b5a7aaf6ccf403864
Parents: be2a338
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 16 19:01:18 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 16 19:01:18 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/457a95f3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72036ea..f92ebfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@
* STORM-1720: Support GEO in storm-redis
## 1.0.2
+ * STORM-1735: Nimbus should log that replication succeeded when min replicas was reached exactly
* STORM-1835: add lock info in thread dump
* STORM-1764: Pacemaker is throwing some stack traces
* STORM-1761: Storm-Solr Example Throws ArrayIndexOutOfBoundsException in Remote Cluster Mode
[2/3] storm git commit: Merge branch 'STORM-1735' of
https://github.com/srdo/storm into STORM-1735
Posted by ka...@apache.org.
Merge branch 'STORM-1735' of https://github.com/srdo/storm into STORM-1735
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/be2a3389
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/be2a3389
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/be2a3389
Branch: refs/heads/master
Commit: be2a338915ca242108af32542b4695ab7c3705c0
Parents: 38d92e9 4fdb5e1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 16 19:00:33 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 16 19:00:33 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------