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:17 UTC

[1/3] storm git commit: Update timer.clj

Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch 2b0ec2465 -> 844d46c83


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/29d1ba55
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/29d1ba55
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/29d1ba55

Branch: refs/heads/0.10.x-branch
Commit: 29d1ba55fc76c5a12d86c59c8a5bb88ad73927d8
Parents: 2b0ec24
Author: Li Wang <wa...@gmail.com>
Authored: Wed Aug 12 22:00:15 2015 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 25 09:12:52 2015 +0900

----------------------------------------------------------------------
 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/29d1ba55/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


[2/3] 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/fc47fd27
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc47fd27
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc47fd27

Branch: refs/heads/0.10.x-branch
Commit: fc47fd27ce2a18a329c6c6ea4ce37ec730df372c
Parents: 29d1ba5
Author: Li Wang <wa...@gmail.com>
Authored: Thu Aug 13 11:45:40 2015 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 25 09:13:01 2015 +0900

----------------------------------------------------------------------
 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/fc47fd27/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


[3/3] storm git commit: add STORM-992 to CHANGELOG.md

Posted by ka...@apache.org.
add STORM-992 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/844d46c8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/844d46c8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/844d46c8

Branch: refs/heads/0.10.x-branch
Commit: 844d46c832e83ea30e0fde3169965b116ce962b1
Parents: fc47fd2
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 25 09:21:43 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 25 09:21:43 2015 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/844d46c8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e679cd5..035711f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,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