You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by go...@apache.org on 2020/05/13 03:24:18 UTC

[incubator-tubemq] 01/07: [TUBEMQ-49] setTimeoutTime change to updTimeoutTime (#39)

This is an automated email from the ASF dual-hosted git repository.

gosonzhang pushed a commit to branch release-0.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git

commit 849cfcdc8ed8b95482136d1ee094259077ba4f0e
Author: gosonzhang <46...@qq.com>
AuthorDate: Wed Mar 25 16:05:47 2020 +0800

    [TUBEMQ-49] setTimeoutTime change to updTimeoutTime (#39)
    
    Co-authored-by: gosonzhang <go...@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() {