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:02 UTC
[2/3] storm git commit: Merge branch 'STORM-1556' of
https://github.com/wuchong/storm into STORM-1556
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)