From 8efd25b33a210f507da58be88e1c93e7f9b7aaed Mon Sep 17 00:00:00 2001
From: Mukul Kumar Singh <msingh@apache.org>
Date: Tue, 1 Oct 2019 14:31:15 +0530
Subject: [PATCH] HDDS-1615. ManagedChannel references are being leaked in
 ReplicationSupervisor.java. Contributed by  Mukul Kumar Singh. (#1547)

---
 .../ozone/container/replication/GrpcReplicationClient.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
index 768d2667c1b..8494a152744 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
     .CopyContainerRequestProto;
@@ -92,6 +93,11 @@ public class GrpcReplicationClient {
 
   public void shutdown() {
     channel.shutdown();
+    try {
+      channel.awaitTermination(5, TimeUnit.SECONDS);
+    } catch (Exception e) {
+      LOG.error("failed to shutdown replication channel", e);
+    }
   }
 
   /**