Call OzoneClientCache#closeClient during stopS3G

apache · Oct 6, 2024 · db67bc0 · db67bc0
1 parent 975d609
commit db67bc0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -83,6 +83,7 @@
 import org.apache.hadoop.ozone.recon.ConfigurationProvider;
 import org.apache.hadoop.ozone.recon.ReconServer;
 import org.apache.hadoop.ozone.s3.Gateway;
+import org.apache.hadoop.ozone.s3.OzoneClientCache;
 import org.apache.hadoop.ozone.s3.OzoneConfigurationHolder;
 import org.apache.hadoop.ozone.s3.S3GatewayConfigKeys;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -616,6 +617,8 @@ private static void stopS3G(Gateway s3g) {
     try {
       if (s3g != null) {
         LOG.info("Stopping S3G");
+        // TODO (HDDS-11539): Remove this workaround once the @PreDestroy issue is fixed
+        OzoneClientCache.closeClient();
         s3g.stop();
       }
     } catch (Exception e) {