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); 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 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 reporterMetaInfos; public List 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