You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by xu...@apache.org on 2022/07/25 15:13:16 UTC
[hudi] branch master updated: [HUDI-4456] Clean up test resources (#6203)
This is an automated email from the ASF dual-hosted git repository.
xushiyan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new eee6a02f77 [HUDI-4456] Clean up test resources (#6203)
eee6a02f77 is described below
commit eee6a02f77c625c86258a5e9b6ae5013c1268c5c
Author: Shiyan Xu <27...@users.noreply.github.com>
AuthorDate: Mon Jul 25 10:13:06 2022 -0500
[HUDI-4456] Clean up test resources (#6203)
---
.../java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java | 2 +-
.../java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java | 2 +-
.../test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java | 2 +-
.../org/apache/hudi/common/testutils/minicluster/HdfsTestService.java | 2 +-
.../org/apache/hudi/common/testutils/minicluster/MiniClusterUtil.java | 4 ++--
.../src/test/java/org/apache/hudi/hadoop/TestInputPathHandler.java | 2 +-
.../src/test/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 dfbb3336b9..08d4f16f23 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 c112422efc..cd8eb33f14 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 43f6376f80..80d185f62b 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 742a595998..eda8591749 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 ecc00e5f68..135d875e43 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 c978cf1419..0be736b2a0 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 7995fea8b8..33f3064631 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();
}