Fix connection leak (#454)

polarismesh · Jan 10, 2024 · ab1e63e · ab1e63e
1 parent e2e7add
commit ab1e63e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java b/...-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java
@@ -645,8 +645,7 @@ public ReportServiceContractResponse reportServiceContract(ReportServiceContract
             ResponseProto.Response reportServiceContractResponse =
                     stub.reportServiceContract(buildReportServiceContractRequest(req));
             GrpcUtil.checkResponse(reportServiceContractResponse);
-            ReportServiceContractResponse resp = new ReportServiceContractResponse();
-            return resp;
+            return new ReportServiceContractResponse();
         } catch (Throwable t) {
             if (t instanceof PolarisException) {
                 throw t;
@@ -723,6 +722,7 @@ public void doDestroy() {
             LOG.info("start to destroy connector {}", getName());
             ThreadPoolUtils.waitAndStopThreadPools(
                     new ExecutorService[]{sendDiscoverExecutor, buildInExecutor, updateServiceExecutor});
+            destroyStreamClient();
             if (null != connectionManager) {
                 connectionManager.destroy();
             }
@@ -759,5 +759,13 @@ public void run() {
         }
     }
 
-
+    private void destroyStreamClient() {
+        for (AtomicReference<SpecStreamClient> streamClientRef : streamClients.values()) {
+            SpecStreamClient streamClient = streamClientRef.get();
+            if (null == streamClient) {
+                continue;
+            }
+            streamClient.closeStream(true);
+        }
+    }
 }