You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yi...@apache.org on 2022/07/23 00:58:11 UTC
[hudi] branch master updated: [HUDI-4437] Fix test conflicts by clearing file system cache (#6123)
This is an automated email from the ASF dual-hosted git repository.
yihua 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 340c3dbbe1 [HUDI-4437] Fix test conflicts by clearing file system cache (#6123)
340c3dbbe1 is described below
commit 340c3dbbe17d70099400a2754e5abb0f4e6a0712
Author: 冯健 <fe...@gmail.com>
AuthorDate: Sat Jul 23 08:58:04 2022 +0800
[HUDI-4437] Fix test conflicts by clearing file system cache (#6123)
Co-authored-by: jian.feng <fe...@gmial.com>
Co-authored-by: jian.feng <ji...@shopee.com>
Co-authored-by: Raymond Xu <27...@users.noreply.github.com>
---
.../src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java | 2 +-
.../apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java | 2 --
.../src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java | 5 +++--
.../src/test/java/org/apache/hudi/hive/testutils/TestCluster.java | 4 +++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java
index 072feeb663..1705979390 100644
--- a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java
+++ b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java
@@ -107,7 +107,7 @@ public class TestHiveSyncTool {
private HoodieHiveSyncClient hiveClient;
@AfterAll
- public static void cleanUpClass() {
+ public static void cleanUpClass() throws IOException {
HiveTestUtil.shutdown();
}
diff --git a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java
index 9dffdd0444..a11b23762e 100644
--- a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java
+++ b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/replication/TestHiveSyncGlobalCommitTool.java
@@ -24,7 +24,6 @@ import org.apache.hudi.hive.testutils.TestCluster;
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -49,7 +48,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@Disabled
public class TestHiveSyncGlobalCommitTool {
@RegisterExtension
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 9687e55792..71882abb65 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
@@ -141,7 +141,7 @@ public class HiveTestUtil {
hiveSyncProps.setProperty(META_SYNC_PARTITION_FIELDS.key(), "datestr");
hiveSyncProps.setProperty(HIVE_BATCH_SYNC_PARTITION_NUM.key(), "3");
- hiveSyncConfig = new HiveSyncConfig(hiveSyncProps, configuration);
+ hiveSyncConfig = new HiveSyncConfig(hiveSyncProps, getHiveConf());
dtfOut = DateTimeFormatter.ofPattern("yyyy/MM/dd");
ddlExecutor = new HiveQueryDDLExecutor(hiveSyncConfig);
@@ -176,7 +176,7 @@ public class HiveTestUtil {
return hiveServer.getHiveConf();
}
- public static void shutdown() {
+ public static void shutdown() throws IOException {
if (hiveServer != null) {
hiveServer.stop();
}
@@ -186,6 +186,7 @@ public class HiveTestUtil {
if (zkServer != null) {
zkServer.shutdown();
}
+ FileSystem.closeAll();
}
public static void createCOWTable(String instantTime, int numberOfPartitions, boolean useSchemaFromCommitMetadata,
diff --git a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/TestCluster.java b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/TestCluster.java
index c1f891fce8..2e8a63cf84 100644
--- a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/TestCluster.java
+++ b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/TestCluster.java
@@ -18,6 +18,7 @@
package org.apache.hudi.hive.testutils;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hudi.avro.HoodieAvroWriteSupport;
import org.apache.hudi.common.bloom.BloomFilter;
import org.apache.hudi.common.bloom.BloomFilterFactory;
@@ -264,10 +265,11 @@ public class TestCluster implements BeforeAllCallback, AfterAllCallback,
}
}
- public void shutDown() {
+ public void shutDown() throws IOException {
stopHiveServer2();
Hive.closeCurrent();
hiveTestService.getHiveMetaStore().stop();
hdfsTestService.stop();
+ FileSystem.closeAll();
}
}