diff --git itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java index 4130a03376..d72c14a6c1 100644 --- itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java +++ itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java @@ -19,8 +19,6 @@ package org.apache.hadoop.hive.ql; import java.io.File; - -import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.fail; @@ -36,7 +34,6 @@ public TestMTQueries() { } } - @Ignore("Disabled due to intermittent failures (HIVE-22616)") @Test public void testMTQueries1() throws Exception { String[] testNames = new String[] {"join2.q", "groupby1.q", "input1.q", "input19.q"}; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java index d658d9ea3c..85ece497c4 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java @@ -51,7 +51,7 @@ private File datasetDir; private static Set srcTables; - private Set missingTables = new HashSet<>(); + private static Set missingTables = new HashSet<>(); public QTestDatasetHandler(HiveConf conf) { // Use path relative to dataDir directory if it is not specified @@ -134,13 +134,15 @@ private static void initSrcTablesFromSystemProperty() { @Override public void processArguments(String arguments) { String[] tables = arguments.split(","); - for (String string : tables) { - string = string.trim(); - if (string.length() == 0) { - continue; - } - if (srcTables == null || !srcTables.contains(string)) { - missingTables.add(string); + synchronized (QTestUtil.class) { + for (String string : tables) { + string = string.trim(); + if (string.length() == 0) { + continue; + } + if (srcTables == null || !srcTables.contains(string)) { + missingTables.add(string); + } } } }