diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java index c227a63..eda72eb 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java @@ -33,6 +33,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; @@ -75,6 +76,7 @@ public static void beforeTest() throws Exception { conf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false); conf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, false); conf.setVar(ConfVars.HIVE_SERVER2_TEZ_DEFAULT_QUEUES, "default"); + conf.setTimeVar(ConfVars.HIVE_TRIGGER_VALIDATION_INTERVAL_MS, 100, TimeUnit.MILLISECONDS); conf.setBoolVar(ConfVars.HIVE_SERVER2_TEZ_INITIALIZE_DEFAULT_SESSIONS, true); conf.setBoolVar(ConfVars.TEZ_EXEC_SUMMARY, true); conf.setBoolVar(ConfVars.HIVE_STRICT_CHECKS_CARTESIAN, false); @@ -131,14 +133,14 @@ public void testTriggerSlowQueryExecutionTime() throws Exception { runQueryWithTrigger(query, null, "Query was cancelled"); } - @Test(timeout = 60000) + @Test(timeout = 90000) public void testTriggerHighShuffleBytes() throws Exception { Expression expression = ExpressionFactory.fromString("SHUFFLE_BYTES > 100"); Trigger trigger = new ExecutionTrigger("big_shuffle", expression, Trigger.Action.KILL_QUERY); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + - " t2 on t1.under_col>=t2.under_col"; - runQueryWithTrigger(query, null, "Query was cancelled"); + String query = "select sleep(t1.under_col, 10), t1.value from " + tableName + " t1 join " + tableName + + " t2 on t1.under_col>=t2.under_col order by t1.under_col"; + runQueryWithTrigger(query, getConfigs(), "Query was cancelled"); } @Test(timeout = 60000)