This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push: new fce6f91 PHOENIX-6546 BackwardCompatibilityIT#testSystemTaskCreationWithIndexAsyncRebuild is flakey fce6f91 is described below commit fce6f9185d06629e11993cba9384ac8ec8dc1e73 Author: Istvan Toth <st...@apache.org> AuthorDate: Wed Sep 15 14:24:41 2021 +0200 PHOENIX-6546 BackwardCompatibilityIT#testSystemTaskCreationWithIndexAsyncRebuild is flakey --- .../phoenix/end2end/BackwardCompatibilityIT.java | 24 +++++++++++++++++----- .../gold_files/gold_query_index_rebuild_async.txt | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java index 5a70e2a..6cca699 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java @@ -95,6 +95,10 @@ public class BackwardCompatibilityIT { @Before public synchronized void doSetup() throws Exception { conf = HBaseConfiguration.create(); + conf.set(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB, + Long.toString(Long.MAX_VALUE)); + conf.set(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB, + Long.toString(Long.MAX_VALUE)); hbaseTestUtil = new HBaseTestingUtility(conf); setUpConfigForMiniCluster(conf); conf.set(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); @@ -372,11 +376,21 @@ public class BackwardCompatibilityIT { if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 15)) { executeQueryWithClientVersion(compatibleClientVersion, INDEX_REBUILD_ASYNC, zkQuorum); - // wait 5 seconds to finish the rebuild job - Thread.sleep(5000); - executeQueriesWithCurrentVersion(QUERY_INDEX_REBUILD_ASYNC, url, NONE); - assertExpectedOutput(QUERY_INDEX_REBUILD_ASYNC); - } + //Check if the task is added. + //It won't start because we set the task intervals to long.MAX_VALUE + int retryCount=0; + while (true) { + try { + executeQueriesWithCurrentVersion(QUERY_INDEX_REBUILD_ASYNC, url, NONE); + assertExpectedOutput(QUERY_INDEX_REBUILD_ASYNC); + break; + } catch (AssertionError e) { + if (retryCount++ > 10) { + throw e; + } + Thread.sleep(5000); + } + } } } @Test diff --git a/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt b/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt index ff020c5..4f96ce0 100644 --- a/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt +++ b/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt @@ -17,7 +17,7 @@ */ 'TASK_TYPE','TABLE_NAME','TASK_STATUS','TASK_PRIORITY' -'2','TI','COMPLETED','4' +'2','TI','CREATED','4' 'K','V' 'key1','val2' 'key3','val3'