From eee6a02f77c625c86258a5e9b6ae5013c1268c5c Mon Sep 17 00:00:00 2001 From: Shiyan Xu <2701446+xushiyan@users.noreply.github.com> Date: Mon, 25 Jul 2022 10:13:06 -0500 Subject: [PATCH] [HUDI-4456] Clean up test resources (#6203) --- .../apache/hudi/testutils/HoodieFlinkClientTestHarness.java | 2 +- .../apache/hudi/testutils/HoodieJavaClientTestHarness.java | 2 +- .../org/apache/hudi/testutils/HoodieClientTestHarness.java | 2 +- .../hudi/common/testutils/minicluster/HdfsTestService.java | 2 +- .../hudi/common/testutils/minicluster/MiniClusterUtil.java | 4 ++-- .../java/org/apache/hudi/hadoop/TestInputPathHandler.java | 2 +- .../java/org/apache/hudi/hive/testutils/HiveTestUtil.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java b/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java index dfbb3336b..08d4f16f2 100644 --- a/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java +++ b/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java @@ -206,7 +206,7 @@ public class HoodieFlinkClientTestHarness extends HoodieCommonTestHarness implem 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-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java index c112422ef..cd8eb33f1 100644 --- a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java +++ b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java @@ -195,7 +195,7 @@ public abstract class HoodieJavaClientTestHarness extends HoodieCommonTestHarnes 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-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java index 43f6376f8..80d185f62 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java @@ -433,7 +433,7 @@ public abstract class HoodieClientTestHarness extends HoodieCommonTestHarness im 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 index 742a59599..eda859174 100644 --- 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 class HdfsTestService { 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 index ecc00e5f6..135d875e4 100644 --- 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 class MiniClusterUtil { 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 index c978cf141..0be736b2a 100644 --- 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 class TestInputPathHandler { 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 index 7995fea8b..33f306463 100644 --- 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 class HiveTestUtil { hiveTestService.stop(); } if (zkServer != null) { - zkServer.shutdown(); + zkServer.shutdown(true); } fileSystem.close(); }