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/08/25 02:24:03 UTC
[1/5] storm git commit: Update timer.clj
Repository: storm
Updated Branches:
refs/heads/master ce6c1c389 -> 949da3853
Update timer.clj
Give a upper bound to the sleeping time, to guarantee a bounded response time for detecting new events.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d1a6f4a7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d1a6f4a7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d1a6f4a7
Branch: refs/heads/master
Commit: d1a6f4a753661f7e825eeec0c51782462fca4d5f
Parents: b0baa63
Author: Li Wang <wa...@gmail.com>
Authored: Wed Aug 12 22:00:15 2015 +0800
Committer: Li Wang <wa...@gmail.com>
Committed: Wed Aug 12 22:00:15 2015 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/timer.clj | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d1a6f4a7/storm-core/src/clj/backtype/storm/timer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/timer.clj b/storm-core/src/clj/backtype/storm/timer.clj
index 6f00a5c..1025b28 100644
--- a/storm-core/src/clj/backtype/storm/timer.clj
+++ b/storm-core/src/clj/backtype/storm/timer.clj
@@ -53,8 +53,11 @@
;; event generation. If any recurring events
;; are scheduled then we will always go
;; through this branch, sleeping only the
- ;; exact necessary amount of time.
- (Time/sleep (- time-millis (current-time-millis)))
+ ;; exact necessary amount of time. We give
+ ;; an upper bound, e.g. 1000 millis, to the
+ ;; sleeping time, to limit the response time
+ ;; for detecting any new event within 1 secs.
+ (Time/sleep (max 1000 (- time-millis (current-time-millis))))
;; Otherwise poll to see if any new event
;; was scheduled. This is, in essence, the
;; response time for detecting any new event
[4/5] storm git commit: add STORM-992 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-992 to CHANGELOG.md
* also add Li Wang 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/199bb3be
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/199bb3be
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/199bb3be
Branch: refs/heads/master
Commit: 199bb3be477ed6a373f70a70b68d5f2a3dff0844
Parents: 7c38ff6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 25 09:07:06 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 25 09:07:06 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/199bb3be/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d043a5f..b035319 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@
* STORM-860: UI: while topology is transitioned to killed, "Activate" button is enabled but not functioning
* STORM-966: ConfigValidation.DoubleValidator doesn't really validate whether the type of the object is a double
* STORM-742: Let ShellBolt treat all messages to update heartbeat
+ * STORM-992: A bug in the timer.clj might cause unexpected delay to schedule new event
## 0.10.0-beta1
* STORM-873: Flux does not handle diamond topologies
http://git-wip-us.apache.org/repos/asf/storm/blob/199bb3be/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index c90a4ed..85974ef 100644
--- a/README.markdown
+++ b/README.markdown
@@ -216,6 +216,7 @@ under the License.
* Arun Mahadevan ([@arunmahadevan](https://github.com/arunmahadevan))
* Yvonne Ironberg ([@YvonneIronberg](https://github.com/YvonneIronberg))
* Boyang Jerry Peng ([@jerrypeng](https://github.com/jerrypeng))
+* Li Wang ([@wangli1426](https://github.com/wangli1426))
## Acknowledgements
[3/5] storm git commit: Merge branch 'master' of
https://github.com/wangli1426/storm into STORM-992
Posted by ka...@apache.org.
Merge branch 'master' of https://github.com/wangli1426/storm into STORM-992
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7c38ff62
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7c38ff62
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7c38ff62
Branch: refs/heads/master
Commit: 7c38ff624833055a940d3189fa89171cd37ed169
Parents: ce6c1c3 a3b29e0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 25 09:03:59 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 25 09:03:59 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/timer.clj | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] storm git commit: Update timer.clj
Posted by ka...@apache.org.
Update timer.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a3b29e00
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a3b29e00
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a3b29e00
Branch: refs/heads/master
Commit: a3b29e005f11d184b8cfe6a53f75f667bf2bec68
Parents: d1a6f4a
Author: Li Wang <wa...@gmail.com>
Authored: Thu Aug 13 11:45:40 2015 +0800
Committer: Li Wang <wa...@gmail.com>
Committed: Thu Aug 13 11:45:40 2015 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/timer.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a3b29e00/storm-core/src/clj/backtype/storm/timer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/timer.clj b/storm-core/src/clj/backtype/storm/timer.clj
index 1025b28..2c76ce2 100644
--- a/storm-core/src/clj/backtype/storm/timer.clj
+++ b/storm-core/src/clj/backtype/storm/timer.clj
@@ -57,7 +57,7 @@
;; an upper bound, e.g. 1000 millis, to the
;; sleeping time, to limit the response time
;; for detecting any new event within 1 secs.
- (Time/sleep (max 1000 (- time-millis (current-time-millis))))
+ (Time/sleep (min 1000 (- time-millis (current-time-millis))))
;; Otherwise poll to see if any new event
;; was scheduled. This is, in essence, the
;; response time for detecting any new event
[5/5] storm git commit: modify STORM-977 to be introduced at
0.10.0-beta2
Posted by ka...@apache.org.
modify STORM-977 to be introduced at 0.10.0-beta2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/949da385
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/949da385
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/949da385
Branch: refs/heads/master
Commit: 949da3853cfe3613ebb0fd4c4b4f6864b483f884
Parents: 199bb3b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 25 09:23:32 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 25 09:23:32 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/949da385/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b035319..6be3d69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@
* STORM-995: Fix excessive logging
* STORM-837: HdfsState ignores commits
* STORM-938: storm-hive add a time interval to flush tuples to hive.
- * STORM-977: Incorrect signal (-9) when as-user is true
* STORM-964: Add config (with small default value) for logwriter to restrict its memory usage
* STORM-980: Re-include storm-kafka tests from Travis CI build
* STORM-960: HiveBolt should ack tuples only after flushing.
@@ -40,6 +39,7 @@
* STORM-949: On the topology summary UI page, last shown error should have the time and date
## 0.10.0-beta2
+ * STORM-977: Incorrect signal (-9) when as-user is true
* STORM-843: [storm-redis] Add Javadoc to storm-redis
* STORM-866: Use storm.log.dir instead of storm.home in log4j2 config
* STORM-810: PartitionManager in storm-kafka should commit latest offset before close