You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/13 18:28:01 UTC
[1/3] storm git commit: [STORM-1453]
nimbus.clj/wait-for-desired-code-replication print wrong log message
Repository: storm
Updated Branches:
refs/heads/master 574928b92 -> bd04e2124
[STORM-1453] nimbus.clj/wait-for-desired-code-replication print wrong log message
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/64a57a39
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/64a57a39
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/64a57a39
Branch: refs/heads/master
Commit: 64a57a39fe1d4b0a1f3d15a264eb3335d72e1af6
Parents: 3db9680
Author: ablecao <ab...@tencent.com>
Authored: Tue Jan 12 09:38:41 2016 +0800
Committer: ablecao <ab...@tencent.com>
Committed: Tue Jan 12 09:38:41 2016 +0800
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/64a57a39/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 3f1d4e5..b7ad71a 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -516,13 +516,13 @@
(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 of " min-replication-count " not achieved but we have hit the max wait time "
- max-replication-wait-time " so moving on with replication count for conf key = " @current-replication-count-conf
- " for code key = " @current-replication-count-code "for jar key = " @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 ", "
- "current-replication-count for jar key = " @current-replication-count-jar))))
+ "current-replication-count for jar key = " @current-replication-count-jar)
+ (log-message "desired replication count of " min-replication-count " not achieved but we have hit the max wait time "
+ max-replication-wait-time " so moving on with replication count for conf key = " @current-replication-count-conf
+ " for code key = " @current-replication-count-code "for jar key = " @current-replication-count-jar))))
(defn- read-storm-topology-as-nimbus [storm-id blob-store]
(Utils/deserialize
[3/3] storm git commit: add STORM-1453 to changelog
Posted by pt...@apache.org.
add STORM-1453 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bd04e212
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bd04e212
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bd04e212
Branch: refs/heads/master
Commit: bd04e212427001d2f02c3cb2a0e7ad320521201b
Parents: a609f7f
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 13 12:27:06 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 13 12:27:06 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bd04e212/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2542405..be2ee41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 2.0.0
## 1.0.0
+ * STORM-1453: nimbus.clj/wait-for-desired-code-replication prints wrong log message
* STORM-1419: Solr bolt should handle tick tuples
* STORM-1175: State store for windowing operations
* STORM-1202: Migrate APIs to org.apache.storm, but try to provide some form of backwards compatability
[2/3] storm git commit: Merge branch 'storm-1453-1' of
github.com:caofangkun/apache-storm
Posted by pt...@apache.org.
Merge branch 'storm-1453-1' of github.com:caofangkun/apache-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a609f7f5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a609f7f5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a609f7f5
Branch: refs/heads/master
Commit: a609f7f58dbe71d41bd8ccb8677b66c2db644dc4
Parents: 574928b 64a57a3
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 13 12:25:50 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 13 12:25:50 2016 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------