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:46:58 UTC
[5/6] git commit: Merge branch 'STORM-244' of
https://github.com/knusbaum/incubator-storm into STORM-244
Merge branch 'STORM-244' of https://github.com/knusbaum/incubator-storm into STORM-244
Conflicts:
storm-core/src/clj/backtype/storm/daemon/drpc.clj
STORM-244: DRPC timeout can return null instead of throwing an exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2ab3bc8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2ab3bc8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2ab3bc8e
Branch: refs/heads/master
Commit: 2ab3bc8e656e7420f235e1f45d37b867c256afa4
Parents: c7c57d5 402d131
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jun 6 11:44:30 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jun 6 11:44:30 2014 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 9 +++++----
storm-core/test/clj/backtype/storm/drpc_test.clj | 17 +++++++++++++++--
2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2ab3bc8e/storm-core/src/clj/backtype/storm/daemon/drpc.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/drpc.clj
index 57c26df,ec56fa7..03d8686
--- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
@@@ -61,9 -57,6 +61,8 @@@
(doseq [[id start] @id->start]
(when (> (time-delta start) (conf DRPC-REQUEST-TIMEOUT-SECS))
(when-let [sem (@id->sem id)]
- (swap! id->result assoc id (DRPCExecutionException. "Request timed out"))
+ (.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)
))