diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java index 88064d9..bf559b4 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java @@ -95,8 +95,10 @@ public void setUp() throws Exception { @After public void tearDown() throws Exception { try { - if (client != null) { + try { client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java index debcd0e..4f11a55 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java @@ -95,7 +95,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java index 770da1a..54bf3d7 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java @@ -95,7 +95,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java index 37ca40c..8ce8531 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java @@ -98,7 +98,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java index 02fb9eb..761b977 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java @@ -59,7 +59,6 @@ public TestCatalogs(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -93,7 +92,11 @@ public void tearDown() throws Exception { } try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java index 7733b2d..efac4cf 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java @@ -60,7 +60,6 @@ public TestCheckConstraint(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -133,7 +132,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java index d558de6..d323ac6 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java @@ -105,7 +105,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java index d56006b..f3e026c 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java @@ -60,7 +60,6 @@ public TestDefaultConstraint(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -133,7 +132,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java index 9037001..2a566e8 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java @@ -110,7 +110,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java index 473b171..1a2b7e4 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java @@ -89,7 +89,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java index d8192b1..b058dd2 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java @@ -62,7 +62,6 @@ public TestForeignKey(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -143,7 +142,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java index b5705f9..db6b599 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java @@ -123,7 +123,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java index 8040728..4d7f7c1 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java @@ -87,7 +87,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java index d8448c8..59daa52 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java @@ -101,7 +101,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java index e5d1058..a338bd4 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java @@ -95,7 +95,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java index 0c75295..b32eeda 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java @@ -60,7 +60,6 @@ public TestNotNullConstraint(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -133,7 +132,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java index 52f5b93..c33572b 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java @@ -60,7 +60,6 @@ public TestPrimaryKey(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -133,7 +132,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java index 0b91ed4..22dbbfd 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java @@ -41,12 +41,9 @@ public class TestRuntimeStats extends MetaStoreClientTest { private final AbstractMetaStoreService metaStore; private IMetaStoreClient client; - private String metastoreName; public TestRuntimeStats(String name, AbstractMetaStoreService metaStore) throws Exception { - this.metastoreName = name; this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -57,7 +54,11 @@ public void setUp() throws Exception { @After public void tearDown() throws Exception { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } client = null; } diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java index be9e7c9..afa8c9f 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java @@ -199,7 +199,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java index 0de7f87..e885c0a 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java @@ -147,7 +147,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java index 00e9104..20c3af0 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java @@ -158,7 +158,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null; diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java index 8eb18ec..5842ec5 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java @@ -60,7 +60,6 @@ public TestUniqueConstraint(String name, AbstractMetaStoreService metaStore) throws Exception { this.metaStore = metaStore; - this.metaStore.start(); } @Before @@ -133,7 +132,11 @@ public void setUp() throws Exception { public void tearDown() throws Exception { try { if (client != null) { - client.close(); + try { + client.close(); + } catch (Exception e) { + // HIVE-19729: Shallow the exceptions based on the discussion in the Jira + } } } finally { client = null;