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 2014/06/06 18:26:12 UTC
[1/4] git commit: STORM-63 remove timeout drpc request from its
function's request queue
Repository: incubator-storm
Updated Branches:
refs/heads/master 3dd27a0b9 -> c7c57d5b0
STORM-63 remove timeout drpc request from its function's request queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/01087656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/01087656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/01087656
Branch: refs/heads/master
Commit: 0108765688e64fa7c039e9478b303c118882d972
Parents: 254ec13
Author: Kang Xiao <kx...@gmail.com>
Authored: Sun Feb 16 23:12:54 2014 +0800
Committer: Kang Xiao <kx...@gmail.com>
Committed: Sun Feb 16 23:12:54 2014 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/01087656/storm-core/src/clj/backtype/storm/daemon/drpc.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/drpc.clj b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
index df07343..54e71e0 100644
--- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
@@ -47,9 +47,13 @@
id->sem (atom {})
id->result (atom {})
id->start (atom {})
+ id->function (atom {})
+ id->request (atom {})
request-queues (atom {})
cleanup (fn [id] (swap! id->sem dissoc id)
(swap! id->result dissoc id)
+ (swap! id->function dissoc id)
+ (swap! id->request dissoc id)
(swap! id->start dissoc id))
my-ip (.getHostAddress (InetAddress/getLocalHost))
clear-thread (async-loop
@@ -59,6 +63,8 @@
(when-let [sem (@id->sem id)]
(swap! id->result assoc id (DRPCExecutionException. "Request timed out"))
(.release sem))
+ (.remove (acquire-queue request-queues (@id->function id)) (@id->request id))
+ (log-warn "Timeout DRPC request id: " id " start at " start)
(cleanup id)
))
TIMEOUT-CHECK-SECS
@@ -74,6 +80,8 @@
]
(swap! id->start assoc id (current-time-secs))
(swap! id->sem assoc id sem)
+ (swap! id->function assoc id function)
+ (swap! id->request assoc id req)
(.add queue req)
(log-debug "Waiting for DRPC result for " function " " args " at " (System/currentTimeMillis))
(.acquire sem)
[3/4] git commit: Merge branch 'STORM-63' of
https://github.com/xiaokang/incubator-storm into STORM-63
Posted by bo...@apache.org.
Merge branch 'STORM-63' of https://github.com/xiaokang/incubator-storm into STORM-63
STORM-63: remove timeout drpc request from its function's request queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/9bfd77b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/9bfd77b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/9bfd77b3
Branch: refs/heads/master
Commit: 9bfd77b30f8a04ceebfcf75f2fac9a1673340340
Parents: 3dd27a0 50408bf
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jun 6 11:21:19 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jun 6 11:21:19 2014 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
[4/4] git commit: Added STORM-63 to Changelog.
Posted by bo...@apache.org.
Added STORM-63 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/c7c57d5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/c7c57d5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/c7c57d5b
Branch: refs/heads/master
Commit: c7c57d5b0af4d7baa96c2ea52f72c828bafc0f22
Parents: 9bfd77b
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jun 6 11:22:10 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jun 6 11:22:10 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/c7c57d5b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 463489f..e6b2888 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-63: remove timeout drpc request from its function's request queue
* STORM-313: Remove log-level-page from logviewer
* STORM-205: Add REST API To Storm UI
* STORM-326: tasks send duplicate metrics
[2/4] git commit: fix added code not in when-let block
Posted by bo...@apache.org.
fix added code not in when-let block
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/50408bfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/50408bfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/50408bfc
Branch: refs/heads/master
Commit: 50408bfc1c193356a66f50f9ce9aeb7786031f4b
Parents: 0108765
Author: Kang Xiao <kx...@gmail.com>
Authored: Sat Mar 8 01:12:22 2014 +0800
Committer: Kang Xiao <kx...@gmail.com>
Committed: Sat Mar 8 01:12:22 2014 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/50408bfc/storm-core/src/clj/backtype/storm/daemon/drpc.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/drpc.clj b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
index 54e71e0..57c26df 100644
--- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
@@ -62,9 +62,9 @@
(when (> (time-delta start) (conf DRPC-REQUEST-TIMEOUT-SECS))
(when-let [sem (@id->sem id)]
(swap! id->result assoc id (DRPCExecutionException. "Request timed out"))
- (.release sem))
(.remove (acquire-queue request-queues (@id->function id)) (@id->request id))
(log-warn "Timeout DRPC request id: " id " start at " start)
+ (.release sem))
(cleanup id)
))
TIMEOUT-CHECK-SECS