[HUDI-4456] Clean up test resources (apache#6203)

fengjian428 · Apr 5, 2023 · 3047532 · 3047532
1 parent d115474
commit 3047532
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/...di-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java b/...di-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java
@@ -206,7 +206,7 @@ protected void cleanupClients() throws java.io.IOException {
   protected void cleanupDFS() throws java.io.IOException {
     if (hdfsTestService != null) {
       hdfsTestService.stop();
-      dfsCluster.shutdown();
+      dfsCluster.shutdown(true, true);
       hdfsTestService = null;
       dfsCluster = null;
       dfs = null;

diff --git a/...hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java b/...hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java
@@ -195,7 +195,7 @@ protected void cleanupClients() {
   protected void cleanupDFS() throws IOException {
     if (hdfsTestService != null) {
       hdfsTestService.stop();
-      dfsCluster.shutdown();
+      dfsCluster.shutdown(true, true);
       hdfsTestService = null;
       dfsCluster = null;
       dfs = null;

diff --git a/...nt/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java b/...nt/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java
@@ -433,7 +433,7 @@ protected void initDFSMetaClient() throws IOException {
   protected void cleanupDFS() throws IOException {
     if (hdfsTestService != null) {
       hdfsTestService.stop();
-      dfsCluster.shutdown();
+      dfsCluster.shutdown(true, true);
       hdfsTestService = null;
       dfsCluster = null;
       dfs = null;

diff --git a/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java b/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java
@@ -104,7 +104,7 @@ public MiniDFSCluster start(boolean format) throws IOException {
   public void stop() {
     LOG.info("HDFS Minicluster service being shut down.");
     if (miniDfsCluster != null) {
-      miniDfsCluster.shutdown();
+      miniDfsCluster.shutdown(true, true);
     }
     miniDfsCluster = null;
     hadoopConf = null;

diff --git a/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/MiniClusterUtil.java b/hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/MiniClusterUtil.java
@@ -50,10 +50,10 @@ public static void setUp() throws IOException, InterruptedException {
 
   public static void shutdown() {
     if (dfsCluster != null) {
-      dfsCluster.shutdown();
+      dfsCluster.shutdown(true, true);
     }
     if (zkServer != null) {
-      zkServer.shutdown();
+      zkServer.shutdown(true);
     }
   }
 }
diff --git a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestInputPathHandler.java b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestInputPathHandler.java
@@ -103,7 +103,7 @@ public static void setUpDFS() throws IOException {
   public static void cleanUp() throws Exception {
     if (hdfsTestService != null) {
       hdfsTestService.stop();
-      dfsCluster.shutdown();
+      dfsCluster.shutdown(true, true);
       dfsCluster = null;
       dfs = null;
       hdfsTestService = null;

diff --git a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java
@@ -184,7 +184,7 @@ public static void shutdown() throws IOException {
       hiveTestService.stop();
     }
     if (zkServer != null) {
-      zkServer.shutdown();
+      zkServer.shutdown(true);
     }
     fileSystem.close();
   }