From f65ffe5d47ea168c2c51315a921e6917813bc9b7 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Thu, 27 Mar 2025 15:23:53 +0800
Subject: [PATCH 1/2] feat:add deadline to grpc request.

---
 .../client/flow/DefaultDiscoveryFlow.java       |  4 ++++
 .../api/plugin/server/ReportClientRequest.java  | 12 ++++++++++++
 .../plugins/connector/grpc/GrpcConnector.java   | 17 ++++++++++-------
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/DefaultDiscoveryFlow.java b/polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/DefaultDiscoveryFlow.java
index 91af95a36..a53dd7334 100644
--- a/polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/DefaultDiscoveryFlow.java
+++ b/polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/DefaultDiscoveryFlow.java
@@ -147,6 +147,7 @@ private InstanceRegisterResponse doRegister(InstanceRegisterRequest req, Map<Str
             long start = System.currentTimeMillis();
             ServiceCallResult serviceCallResult = new ServiceCallResult();
             CommonProviderRequest request = req.getRequest();
+            request.setTimeoutMs(timeout);
             try {
                 CommonProviderResponse response = serverConnector.registerInstance(request, customHeader);
                 LOG.info("register {}/{} instance {} successfully", req.getNamespace(), req.getService(),
@@ -183,6 +184,7 @@ public void deRegister(InstanceDeregisterRequest req) {
             long start = System.currentTimeMillis();
             ServiceCallResult serviceCallResult = new ServiceCallResult();
             CommonProviderRequest request = req.getRequest();
+            request.setTimeoutMs(timeout);
             try {
                 serverConnector.deregisterInstance(request);
                 serviceCallResult.setRetStatus(RetStatus.RetSuccess);
@@ -250,6 +252,7 @@ public ReportServiceContractResponse reportServiceContract(ReportServiceContract
         while (timeout > 0) {
             long start = System.currentTimeMillis();
             ServiceCallResult serviceCallResult = new ServiceCallResult();
+            req.setTimeoutMs(timeout);
             try {
                 ReportServiceContractResponse response = serverConnector.reportServiceContract(req);
                 serviceCallResult.setRetStatus(RetStatus.RetSuccess);
@@ -286,6 +289,7 @@ public ServiceRuleResponse getServiceContract(GetServiceContractRequest req) {
             CommonServiceContractRequest request = req.getRequest();
             request.setNamespace(req.getNamespace());
             request.setService(req.getService());
+            request.setTimeoutMs(timeout);
             try {
                 ServiceRuleByProto response = serverConnector.getServiceContract(request);
                 serviceCallResult.setRetStatus(RetStatus.RetSuccess);
diff --git a/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ReportClientRequest.java b/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ReportClientRequest.java
index 71c1c551b..dfeb10227 100644
--- a/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ReportClientRequest.java
+++ b/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ReportClientRequest.java
@@ -39,6 +39,8 @@ public class ReportClientRequest {
 
     private TargetServer targetServer;
 
+    private long timeoutMs;
+
     private List<ReporterMetaInfo> reporterMetaInfos;
 
     public List<ReporterMetaInfo> getReporterMetaInfos() {
@@ -89,6 +91,14 @@ public void setTargetServer(TargetServer targetServer) {
         this.targetServer = targetServer;
     }
 
+    public long getTimeoutMs() {
+        return timeoutMs;
+    }
+
+    public void setTimeoutMs(long timeoutMs) {
+        this.timeoutMs = timeoutMs;
+    }
+
     @Override
     public String toString() {
         return "ReportClientRequest{" +
@@ -97,6 +107,8 @@ public String toString() {
                 ", clientHost='" + clientHost + '\'' +
                 ", version='" + version + '\'' +
                 ", targetServer=" + targetServer +
+                ", timeoutMs=" + timeoutMs +
+                ", reporterMetaInfos=" + reporterMetaInfos +
                 '}';
     }
 }
diff --git a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java
index 24c1bf87f..0c2af90f7 100644
--- a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java
+++ b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java
@@ -309,7 +309,8 @@ public CommonProviderResponse registerInstance(CommonProviderRequest req, Map<St
             stub = GrpcUtil.attachRequestHeader(stub, GrpcUtil.nextInstanceRegisterReqId());
             stub = GrpcUtil.attachRequestHeader(stub, customHeader);
             stub = GrpcUtil.attachAccessToken(connectorConfig.getToken(), stub);
-            ResponseProto.Response registerInstanceResponse = stub.registerInstance(buildRegisterInstanceRequest(req));
+            ResponseProto.Response registerInstanceResponse = stub.withDeadlineAfter(req.getTimeoutMs(),
+                    TimeUnit.MILLISECONDS).registerInstance(buildRegisterInstanceRequest(req));
             GrpcUtil.checkResponse(registerInstanceResponse);
             if (!registerInstanceResponse.hasInstance()) {
                 throw new PolarisException(ErrorCode.SERVER_USER_ERROR,
@@ -470,8 +471,8 @@ public void deregisterInstance(CommonProviderRequest req) throws PolarisExceptio
             PolarisGRPCGrpc.PolarisGRPCBlockingStub stub = PolarisGRPCGrpc.newBlockingStub(connection.getChannel());
             stub = GrpcUtil.attachRequestHeader(stub, GrpcUtil.nextInstanceDeRegisterReqId());
             stub = GrpcUtil.attachAccessToken(connectorConfig.getToken(), stub);
-            ResponseProto.Response deregisterInstanceResponse = stub
-                    .deregisterInstance(buildDeregisterInstanceRequest(req));
+            ResponseProto.Response deregisterInstanceResponse = stub.withDeadlineAfter(req.getTimeoutMs(),
+                    TimeUnit.MILLISECONDS).deregisterInstance(buildDeregisterInstanceRequest(req));
             GrpcUtil.checkResponse(deregisterInstanceResponse);
             LOG.debug("received deregister response {}", deregisterInstanceResponse);
         } catch (Throwable t) {
@@ -551,7 +552,8 @@ public ReportClientResponse reportClient(ReportClientRequest req) throws Polaris
             stub = GrpcUtil.attachRequestHeader(stub, GrpcUtil.nextHeartbeatReqId());
             stub = GrpcUtil.attachAccessToken(connectorConfig.getToken(), stub);
             ClientProto.Client request = buildReportRequest(req);
-            ResponseProto.Response response = stub.reportClient(request);
+            ResponseProto.Response response = stub.withDeadlineAfter(req.getTimeoutMs(),
+                    TimeUnit.MILLISECONDS).reportClient(request);
             LOG.debug("reportClient req:{}, rsp:{}", req, TextFormat.shortDebugString(response));
             GrpcUtil.checkResponse(response);
             ReportClientResponse rsp = new ReportClientResponse();
@@ -625,8 +627,8 @@ public ReportServiceContractResponse reportServiceContract(ReportServiceContract
                     PolarisServiceContractGRPCGrpc.newBlockingStub(connection.getChannel());
             stub = GrpcUtil.attachRequestHeader(stub, GrpcUtil.nextReportServiceContractReqId());
             stub = GrpcUtil.attachAccessToken(connectorConfig.getToken(), stub);
-            ResponseProto.Response reportServiceContractResponse =
-                    stub.reportServiceContract(buildReportServiceContractRequest(req));
+            ResponseProto.Response reportServiceContractResponse = stub.withDeadlineAfter(req.getTimeoutMs(),
+                    TimeUnit.MILLISECONDS).reportServiceContract(buildReportServiceContractRequest(req));
             GrpcUtil.checkResponse(reportServiceContractResponse);
             return new ReportServiceContractResponse();
         } catch (Throwable t) {
@@ -663,7 +665,8 @@ public ServiceRuleByProto getServiceContract(CommonServiceContractRequest req) t
                     PolarisServiceContractGRPCGrpc.newBlockingStub(connection.getChannel());
             stub = GrpcUtil.attachRequestHeader(stub, GrpcUtil.nextReportServiceContractReqId());
             stub = GrpcUtil.attachAccessToken(connectorConfig.getToken(), stub);
-            ResponseProto.Response response = stub.getServiceContract(req.toQuerySpec());
+            ResponseProto.Response response = stub.withDeadlineAfter(req.getTimeoutMs(),
+                    TimeUnit.MILLISECONDS).getServiceContract(req.toQuerySpec());
             GrpcUtil.checkResponse(response);
             ServiceContractProto.ServiceContract remoteVal = response.getServiceContract();
             return new ServiceRuleByProto(remoteVal, remoteVal.getRevision(), false, EventType.SERVICE_CONTRACT);

From 5d335a319112ef1ff005704243d57daa1dc1b008 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Thu, 27 Mar 2025 15:38:06 +0800
Subject: [PATCH 2/2] feat:add deadline to grpc request.

---
 .../src/main/java/com/tencent/polaris/client/api/SDKContext.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/polaris-common/polaris-client/src/main/java/com/tencent/polaris/client/api/SDKContext.java b/polaris-common/polaris-client/src/main/java/com/tencent/polaris/client/api/SDKContext.java
index 98d26ac77..b8aa6c067 100644
--- a/polaris-common/polaris-client/src/main/java/com/tencent/polaris/client/api/SDKContext.java
+++ b/polaris-common/polaris-client/src/main/java/com/tencent/polaris/client/api/SDKContext.java
@@ -376,6 +376,7 @@ private void reportClient(Extensions extensions) {
                     }
                 }
                 reportClientRequest.setReporterMetaInfos(reporterMetaInfos);
+                reportClientRequest.setTimeoutMs(extensions.getConfiguration().getGlobal().getAPI().getTimeout());
 
                 try {
                     ReportClientResponse reportClientResponse = serverConnector.reportClient(reportClientRequest);