fix:add deadline to heartbeat.

Author: SkyeBeFreeman

polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/api/DefaultProviderAPI.java

@@ -159,6 +159,7 @@ public void heartbeat(InstanceHeartbeatRequest req) throws PolarisException {
             long start = System.currentTimeMillis();
             ServiceCallResult serviceCallResult = new ServiceCallResult();
             CommonProviderRequest request = req.getRequest();
+            request.setTimeoutMs(timeout);
             try {
                 serverConnector.heartbeat(request);
                 serviceCallResult.setRetStatus(RetStatus.RetSuccess);

polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/CommonProviderRequest.java

@@ -53,6 +53,8 @@ public class CommonProviderRequest {
 
     private String campus;
 
+    private long timeoutMs;
+
     public String getInstanceID() {
         return instanceID;
     }
@@ -181,6 +183,14 @@ public void setCampus(String campus) {
         this.campus = campus;
     }
 
+    public long getTimeoutMs() {
+        return timeoutMs;
+    }
+
+    public void setTimeoutMs(long timeoutMs) {
+        this.timeoutMs = timeoutMs;
+    }
+
     @Override
     public String toString() {
         return "CommonProviderRequest{" +
@@ -196,10 +206,11 @@ public String toString() {
                 ", priority=" + priority +
                 ", metadata=" + metadata +
                 ", ttl=" + ttl +
-                ", zone=" + zone +
-                ", region=" + region +
-                ", campus=" + campus +
+                ", targetServer=" + targetServer +
+                ", zone='" + zone + '\'' +
+                ", region='" + region + '\'' +
+                ", campus='" + campus + '\'' +
+                ", timeoutMs=" + timeoutMs +
                 '}';
     }
-
 }

polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java

@@ -515,14 +515,17 @@ public void heartbeat(CommonProviderRequest req) throws PolarisException {
         checkDestroyed();
         Connection connection = null;
         ServiceKey serviceKey = new ServiceKey(req.getNamespace(), req.getService());
+        long startTimestamp = 0L;
         try {
             waitDiscoverReady();
             connection = connectionManager
                     .getConnection(GrpcUtil.OP_KEY_INSTANCE_HEARTBEAT, ClusterType.HEALTH_CHECK_CLUSTER);
             req.setTargetServer(connectionToTargetNode(connection));
             PolarisGRPCGrpc.PolarisGRPCBlockingStub stub = PolarisGRPCGrpc.newBlockingStub(connection.getChannel());
             GrpcUtil.attachRequestHeader(stub, GrpcUtil.nextHeartbeatReqId());
-            ResponseProto.Response heartbeatResponse = stub.heartbeat(buildHeartbeatRequest(req));
+            startTimestamp = System.currentTimeMillis();
+            LOG.debug("start heartbeat at {} ms", startTimestamp);
+            ResponseProto.Response heartbeatResponse = stub.withDeadlineAfter(req.getTimeoutMs(), TimeUnit.MILLISECONDS).heartbeat(buildHeartbeatRequest(req));
             GrpcUtil.checkResponse(heartbeatResponse);
             LOG.debug("received heartbeat response {}", heartbeatResponse);
         } catch (Throwable t) {
@@ -537,6 +540,8 @@ public void heartbeat(CommonProviderRequest req) throws PolarisException {
                     String.format("fail to heartbeat id %s, host %s:%d service %s",
                             req.getInstanceID(), req.getHost(), req.getPort(), serviceKey), t);
         } finally {
+            long endTimestamp = System.currentTimeMillis();
+            LOG.debug("end heartbeat at {} ms. Diff {} ms", endTimestamp, endTimestamp - startTimestamp);
             if (null != connection) {
                 connection.release(GrpcUtil.OP_KEY_INSTANCE_HEARTBEAT);
             }

pom.xml

@@ -64,7 +64,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>1.12.2</revision>
+        <revision>1.12.3</revision>
 
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>