Repository: tajo Updated Branches: refs/heads/index_support 694940848 -> 4d7910a08
TAJO-1541: Connection timeout in netty client is not working Closes #528 Signed-off-by: Jihun Kang <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/daf55ea4 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/daf55ea4 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/daf55ea4 Branch: refs/heads/index_support Commit: daf55ea45572494d996dad7cb3e207fbc9489102 Parents: 6136142 Author: navis.ryu <[email protected]> Authored: Mon Apr 13 10:40:00 2015 +0900 Committer: Jihun Kang <[email protected]> Committed: Mon Apr 13 10:40:00 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../src/main/java/org/apache/tajo/rpc/RpcUtils.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/daf55ea4/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 76f5e75..1ae67a5 100644 --- a/CHANGES +++ b/CHANGES @@ -80,6 +80,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1541: Connection timeout in netty client is not working. + (Contributed by navis, Committed by jihun) + TAJO-1500: FinishedTaskCleanThread is not interrupted when worker stops. (Contributed by navis, Committed by jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/daf55ea4/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcUtils.java ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcUtils.java b/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcUtils.java index 99905b9..3866b09 100644 --- a/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcUtils.java +++ b/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcUtils.java @@ -81,7 +81,7 @@ public class RpcUtils { public void elapsed() { long current = System.currentTimeMillis(); - remaining -= (prev - current); + remaining -= current - prev; prev = current; }
