Skip to content

[HUDI-4456] Clean up test resources #6203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xushiyan merged 1 commit into from
Jul 25, 2022
Merged

[HUDI-4456] Clean up test resources #6203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...di-flink-client/src/test/java/org/apache/hudi/testutils/HoodieFlinkClientTestHarness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...nt/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/HdfsTestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions hudi-common/src/test/java/org/apache/hudi/common/testutils/minicluster/MiniClusterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
2 changes: 1 addition & 1 deletion hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/TestInputPathHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public static void shutdown() throws IOException {
hiveTestService.stop();
}
if (zkServer != null) {
zkServer.shutdown();
zkServer.shutdown(true);
}
FileSystem.closeAll();
}
Expand Down