This is an automated email from the ASF dual-hosted git repository. osgooli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
The following commit(s) were added to refs/heads/master by this push: new fb9cfa6 [TUBEMQ-49] setTimeoutTime change to updTimeoutTime (#39) fb9cfa6 is described below commit fb9cfa60ff3b28653cc411f44b7b1033fd98a4d0 Author: gosonzhang <4675...@qq.com> AuthorDate: Wed Mar 25 16:05:47 2020 +0800 [TUBEMQ-49] setTimeoutTime change to updTimeoutTime (#39) Co-authored-by: gosonzhang <gosonzh...@tencent.com> --- .../org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java | 6 +++--- .../java/org/apache/tubemq/server/common/heartbeat/TimeoutInfo.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java index 717d681..44f734b 100644 --- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java +++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java @@ -247,7 +247,7 @@ public class HeartbeatManager { .append("Invalid node id:").append(nodeId) .append(", you have to append node first!").toString()); } - timeoutInfo.setTimeoutTime(System.currentTimeMillis() + this.brokerTimeoutDlt); + timeoutInfo.updTimeoutTime(this.brokerTimeoutDlt); } /** @@ -263,7 +263,7 @@ public class HeartbeatManager { .append("Invalid node id:").append(nodeId) .append(", you have to append node first!").toString()); } - timeoutInfo.setTimeoutTime(System.currentTimeMillis() + this.producerTimeoutDlt); + timeoutInfo.updTimeoutTime(this.producerTimeoutDlt); } /** @@ -279,7 +279,7 @@ public class HeartbeatManager { .append("Invalid node id:").append(nodeId) .append(", you have to append node first!").toString()); } - timeoutInfo.setTimeoutTime(System.currentTimeMillis() + this.consumerTimeoutDlt); + timeoutInfo.updTimeoutTime(this.consumerTimeoutDlt); } /** diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/TimeoutInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/TimeoutInfo.java index 87147e7..52cf18f 100644 --- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/TimeoutInfo.java +++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/TimeoutInfo.java @@ -41,8 +41,8 @@ public class TimeoutInfo { return timeoutTime; } - public void setTimeoutTime(long timeoutTime) { - this.timeoutTime = timeoutTime; + public void updTimeoutTime(long timeoutDelta) { + this.timeoutTime = timeoutDelta + System.currentTimeMillis(); } public String getSecondKey() {