This is an automated email from the ASF dual-hosted git repository. kgyrtkirk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
commit 4ef051c8f6a654cc78352a1250b2d80410fa2b37 Author: Zoltan Haindrich <k...@rxd.hu> AuthorDate: Wed Apr 22 08:11:15 2020 +0000 HIVE-23250: Scheduled query related qtests may not finish before it's expected (Zoltan Haindrich reviewed by Peter Vary) Signed-off-by: Zoltan Haindrich <zhaindr...@cloudera.com> --- .../org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java | 5 ++++- ql/src/test/queries/clientpositive/schq_analyze.q | 2 +- ql/src/test/queries/clientpositive/schq_ingest.q | 2 +- ql/src/test/queries/clientpositive/schq_materialized.q | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java b/ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java index f2fc421..4f7990f 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java @@ -205,6 +205,9 @@ public class TestScheduledQueryStatements { @Test public void testExecuteImmediate() throws ParseException, Exception { + // use a different namespace because the schq executor might be able to + // catch the new schq execution immediately + env_setup.getTestCtx().hiveConf.setVar(ConfVars.HIVE_SCHEDULED_QUERIES_NAMESPACE, "immed"); IDriver driver = createDriver(); driver.run("set role admin"); @@ -213,7 +216,7 @@ public class TestScheduledQueryStatements { driver.run("alter scheduled query immed execute"); try (CloseableObjectStore os = new CloseableObjectStore(env_setup.getTestCtx().hiveConf)) { - Optional<MScheduledQuery> sq = os.getMScheduledQuery(new ScheduledQueryKey("immed", "hive")); + Optional<MScheduledQuery> sq = os.getMScheduledQuery(new ScheduledQueryKey("immed", "immed")); assertTrue(sq.isPresent()); assertThat(sq.get().getNextExecution(), Matchers.lessThanOrEqualTo((int) (System.currentTimeMillis() / 1000))); int cnt1 = ScheduledQueryExecutionService.getForcedScheduleCheckCount(); diff --git a/ql/src/test/queries/clientpositive/schq_analyze.q b/ql/src/test/queries/clientpositive/schq_analyze.q index 3c03360..246a215 100644 --- a/ql/src/test/queries/clientpositive/schq_analyze.q +++ b/ql/src/test/queries/clientpositive/schq_analyze.q @@ -21,7 +21,7 @@ create scheduled query t_analyze cron '0 */1 * * * ? *' as analyze table t compu alter scheduled query t_analyze execute; -!sleep 10; +!sleep 30; select * from information_schema.scheduled_executions s where schedule_name='ex_analyze' order by scheduled_execution_id desc limit 3; diff --git a/ql/src/test/queries/clientpositive/schq_ingest.q b/ql/src/test/queries/clientpositive/schq_ingest.q index b7bc90c..8ffc722 100644 --- a/ql/src/test/queries/clientpositive/schq_ingest.q +++ b/ql/src/test/queries/clientpositive/schq_ingest.q @@ -39,7 +39,7 @@ insert into s values(2,2),(3,3); -- pretend that a timeout have happened alter scheduled query ingest execute; -!sleep 10; +!sleep 30; select state,error_message from sys.scheduled_executions; select * from t order by id; diff --git a/ql/src/test/queries/clientpositive/schq_materialized.q b/ql/src/test/queries/clientpositive/schq_materialized.q index 7242f3e..46b725e 100644 --- a/ql/src/test/queries/clientpositive/schq_materialized.q +++ b/ql/src/test/queries/clientpositive/schq_materialized.q @@ -68,7 +68,7 @@ select `(NEXT_EXECUTION|SCHEDULED_QUERY_ID)?+.+` from sys.scheduled_queries; alter scheduled query d execute; -!sleep 10; +!sleep 30; -- the scheduled execution will fail - because of missing TXN; but overall it works.. select state,error_message from sys.scheduled_executions;