You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/22 21:52:01 UTC
[1/3] storm git commit: nimbus.clj/wait-for-desired-code-replication
wrong reset for current-replication-count-jar in local mode
Repository: storm
Updated Branches:
refs/heads/master e675f771c -> a91abdb4e
nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/56004150
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/56004150
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/56004150
Branch: refs/heads/master
Commit: 56004150b229f50c5198233ad436420c1aa981ff
Parents: bb60f11
Author: wuchong <co...@qq.com>
Authored: Thu Feb 18 20:47:19 2016 +0800
Committer: wuchong <co...@qq.com>
Committed: Thu Feb 18 21:03:13 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/56004150/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 710cd83..ddcbada 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 @@
" total-wait-time " @total-wait-time)
(swap! total-wait-time inc)
(if (not (ConfigUtils/isLocalMode conf))
- (reset! current-replication-count-conf (get-blob-replication-count (ConfigUtils/masterStormConfKey storm-id) nimbus)))
+ (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-jar (get-blob-replication-count (ConfigUtils/masterStormJarKey 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))
@@ -1752,8 +1752,8 @@
[this ^String file]
(mark! nimbus:num-beginFileDownload-calls)
(check-authorization! nimbus nil nil "fileDownload")
- (let [is (BufferInputStream. (.getBlob (:blob-store nimbus) file nil)
- ^Integer (Utils/getInt (conf STORM-BLOBSTORE-INPUTSTREAM-BUFFER-SIZE-BYTES)
+ (let [is (BufferInputStream. (.getBlob (:blob-store nimbus) file nil)
+ ^Integer (Utils/getInt (conf STORM-BLOBSTORE-INPUTSTREAM-BUFFER-SIZE-BYTES)
(int 65536)))
id (Utils/uuid)]
(.put (:downloaders nimbus) id is)
[3/3] storm git commit: Added STORM-1556 to Changelog
Posted by bo...@apache.org.
Added STORM-1556 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a91abdb4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a91abdb4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a91abdb4
Branch: refs/heads/master
Commit: a91abdb4e6cec53746afe8b3c1ef7b2b9c6fb764
Parents: 57317ea
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Mar 22 15:24:21 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Mar 22 15:24:21 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a91abdb4/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c0e1c1..0a81117 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
* STORM-1521: When using Kerberos login from keytab with multiple bolts/executors ticket is not renewed in hbase bolt.
## 1.0.0
+ * STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode
* STORM-1636: Supervisor shutdown with worker id pass in being nil
* STORM-1602: Blobstore UTs are failed on Windows
* STORM-1629: Files/move doesn't work properly with non-empty directory in Windows
[2/3] storm git commit: Merge branch 'STORM-1556' of
https://github.com/wuchong/storm into STORM-1556
Posted by bo...@apache.org.
Merge branch 'STORM-1556' of https://github.com/wuchong/storm into STORM-1556
STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/57317ea1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/57317ea1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/57317ea1
Branch: refs/heads/master
Commit: 57317ea1c43094cb726bc602b407a94347543661
Parents: e675f77 5600415
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Mar 22 15:23:49 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Mar 22 15:23:49 2016 -0500
----------------------------------------------------------------------
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/57317ea1/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index ef9b7e3,ddcbada..8847d0d
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@@ -1729,10 -1750,10 +1729,10 @@@
(^String beginFileDownload
[this ^String file]
- (mark! nimbus:num-beginFileDownload-calls)
+ (.mark nimbus:num-beginFileDownload-calls)
(check-authorization! nimbus nil nil "fileDownload")
- (let [is (BufferInputStream. (.getBlob (:blob-store nimbus) file nil)
- ^Integer (Utils/getInt (conf STORM-BLOBSTORE-INPUTSTREAM-BUFFER-SIZE-BYTES)
+ (let [is (BufferInputStream. (.getBlob (:blob-store nimbus) file nil)
+ ^Integer (Utils/getInt (conf STORM-BLOBSTORE-INPUTSTREAM-BUFFER-SIZE-BYTES)
(int 65536)))
id (Utils/uuid)]
(.put (:downloaders nimbus) id is)