[gobblin] branch master updated: [GOBBLIN-1855] Metadata writer tests do not work in isolation after upgrading to Iceberg 1.2.0 (#3718)

[zihanli58]

This is an automated email from the ASF dual-hosted git repository.

zihanli58 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a9dd53b8 [GOBBLIN-1855] Metadata writer tests do not work in 
isolation after upgrading to Iceberg 1.2.0 (#3718)
4a9dd53b8 is described below

commit 4a9dd53b885f0166dccac5026e4e2c632c98a419
Author: Matthew Ho <m...@linkedin.com>
AuthorDate: Tue Jul 18 17:29:55 2023 -0700

    [GOBBLIN-1855] Metadata writer tests do not work in isolation after 
upgrading to Iceberg 1.2.0 (#3718)
---
 .../predicates/DatasetHiveSchemaContainsNonOptionalUnionTest.java   | 6 +++++-
 .../org/apache/gobblin/iceberg/writer/HiveMetadataWriterTest.java   | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/predicates/DatasetHiveSchemaContainsNonOptionalUnionTest.java
 
b/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/predicates/DatasetHiveSchemaContainsNonOptionalUnionTest.java
index 14041cdec..5436b5e6d 100644
--- 
a/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/predicates/DatasetHiveSchemaContainsNonOptionalUnionTest.java
+++ 
b/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/predicates/DatasetHiveSchemaContainsNonOptionalUnionTest.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.util.Collections;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.hive.metastore.api.AlreadyExistsException;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Table;
@@ -66,7 +67,10 @@ public class DatasetHiveSchemaContainsNonOptionalUnionTest 
extends HiveMetastore
   @BeforeSuite
   public void setup() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
-    startMetastore();
+    try {
+      startMetastore();
+    } catch (AlreadyExistsException ignored) { }
+
     tmpDir = Files.createTempDir();
     dbUri = String.format("%s/%s/%s", tmpDir.getAbsolutePath(),"metastore", 
dbName);
     try {
diff --git 
a/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/writer/HiveMetadataWriterTest.java
 
b/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/writer/HiveMetadataWriterTest.java
index aa6c73d52..2797bdf49 100644
--- 
a/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/writer/HiveMetadataWriterTest.java
+++ 
b/gobblin-iceberg/src/test/java/org/apache/gobblin/iceberg/writer/HiveMetadataWriterTest.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.metastore.IMetaStoreClient;
+import org.apache.hadoop.hive.metastore.api.AlreadyExistsException;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.serde.serdeConstants;
@@ -128,6 +129,10 @@ public class HiveMetadataWriterTest extends 
HiveMetastoreTest {
   @BeforeSuite
   public void setUp() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
+    try {
+      startMetastore();
+    } catch (AlreadyExistsException ignored) { }
+
     State state = 
ConfigUtils.configToState(ConfigUtils.propertiesToConfig(hiveConf.getAllProperties()));
     Optional<String> metastoreUri = 
Optional.fromNullable(state.getProperties().getProperty(HiveRegister.HIVE_METASTORE_URI_KEY));
     hc = HiveMetastoreClientPool.get(state.getProperties(), metastoreUri);