This is an automated email from the ASF dual-hosted git repository. gabriellee pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push: new c97422bd3d [enhancement](regression-test) add sleep 3s for schema change and rollup (#17484) c97422bd3d is described below commit c97422bd3d893e4cb49814692fa94091f0315561 Author: yiguolei <676222...@qq.com> AuthorDate: Wed Mar 8 10:43:05 2023 +0800 [enhancement](regression-test) add sleep 3s for schema change and rollup (#17484) Co-authored-by: yiguolei <yiguo...@gmail.com> --- .../src/main/java/org/apache/doris/datasource/InternalCatalog.java | 4 +++- .../suites/datatype_p0/date/test_default_current_timestamp.groovy | 1 + regression-test/suites/index_p0/test_bitmap_index.groovy | 6 ++++++ regression-test/suites/inverted_index_p0/test_bitmap_index.groovy | 6 ++++++ regression-test/suites/nereids_syntax_p0/rollup.groovy | 1 + .../suites/nereids_syntax_p0/test_materialized_view_nereids.groovy | 3 +++ regression-test/suites/rollup/test_materialized_view_bitmap.groovy | 1 + regression-test/suites/rollup/test_materialized_view_date.groovy | 4 ++++ regression-test/suites/rollup/test_materialized_view_hll.groovy | 1 + .../suites/rollup/test_materialized_view_hll_with_light_sc.groovy | 1 + regression-test/suites/rollup_p0/test_materialized_view.groovy | 3 +++ regression-test/suites/rollup_p0/test_rollup_add_column.groovy | 2 ++ regression-test/suites/rollup_p0/test_rollup_agg.groovy | 2 ++ regression-test/suites/rollup_p0/test_rollup_agg_date.groovy | 2 ++ .../test_alter_table_column_with_delete_drop_column_dup_key.groovy | 7 +++++++ ...st_alter_table_column_with_delete_drop_column_unique_key.groovy | 5 +++++ .../schema_change/test_schema_change_datev2_with_delete.groovy | 3 +++ .../suites/schema_change/test_schema_change_with_delete.groovy | 1 + .../datev2/test_agg_keys_schema_change_datev2.groovy | 6 ++++++ .../datev2/test_dup_keys_schema_change_datev2.groovy | 3 +++ .../decimalv3/test_agg_keys_schema_change_decimalv3.groovy | 5 +++++ .../suites/schema_change_p0/test_agg_keys_schema_change.groovy | 2 ++ .../suites/schema_change_p0/test_agg_mv_schema_change.groovy | 2 ++ .../suites/schema_change_p0/test_agg_rollup_schema_change.groovy | 2 ++ .../suites/schema_change_p0/test_alter_table_column.groovy | 4 ++++ .../schema_change_p0/test_alter_table_column_nullable.groovy | 3 +++ .../schema_change_p0/test_alter_table_column_with_delete.groovy | 1 + .../suites/schema_change_p0/test_dup_keys_schema_change.groovy | 1 + .../suites/schema_change_p0/test_dup_mv_schema_change.groovy | 2 ++ .../suites/schema_change_p0/test_dup_rollup_schema_change.groovy | 2 ++ regression-test/suites/schema_change_p0/test_rename_column.groovy | 2 ++ regression-test/suites/schema_change_p0/test_schema_change.groovy | 1 + .../suites/schema_change_p0/test_uniq_mv_schema_change.groovy | 1 + .../suites/schema_change_p0/test_uniq_rollup_schema_change.groovy | 2 ++ .../suites/schema_change_p0/test_update_schema_change.groovy | 2 ++ 35 files changed, 93 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java index 132cebbbdf..4844be37df 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java @@ -311,7 +311,9 @@ public class InternalCatalog implements CatalogIf<Database> { // to see which thread held this lock for long time. Thread owner = lock.getOwner(); if (owner != null) { - LOG.debug("catalog lock is held by: {}", Util.dumpThread(owner, 10)); + // There are many catalog timeout during regression test + // And this timeout should not happen very often, so it could be info log + LOG.info("catalog lock is held by: {}", Util.dumpThread(owner, 10)); } } diff --git a/regression-test/suites/datatype_p0/date/test_default_current_timestamp.groovy b/regression-test/suites/datatype_p0/date/test_default_current_timestamp.groovy index 1cc6ad8044..21e61a1ef2 100644 --- a/regression-test/suites/datatype_p0/date/test_default_current_timestamp.groovy +++ b/regression-test/suites/datatype_p0/date/test_default_current_timestamp.groovy @@ -40,6 +40,7 @@ suite("test_default_current_timestamp") { while(max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/index_p0/test_bitmap_index.groovy b/regression-test/suites/index_p0/test_bitmap_index.groovy index 2267ef38dc..d18ee68df5 100644 --- a/regression-test/suites/index_p0/test_bitmap_index.groovy +++ b/regression-test/suites/index_p0/test_bitmap_index.groovy @@ -65,6 +65,7 @@ suite("test_bitmap_index") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -85,6 +86,7 @@ suite("test_bitmap_index") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -144,6 +146,7 @@ suite("test_bitmap_index") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -168,6 +171,7 @@ suite("test_bitmap_index") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -227,6 +231,7 @@ suite("test_bitmap_index") { while (max_try_secs--) { String res = getJobState(tbName3) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -247,6 +252,7 @@ suite("test_bitmap_index") { while (max_try_secs--) { String res = getJobState(tbName3) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) diff --git a/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy b/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy index fceca1dd2a..e7a81388cf 100644 --- a/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy +++ b/regression-test/suites/inverted_index_p0/test_bitmap_index.groovy @@ -57,6 +57,7 @@ suite("test_bitmap_index", "inverted_index") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -77,6 +78,7 @@ suite("test_bitmap_index", "inverted_index") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -128,6 +130,7 @@ suite("test_bitmap_index", "inverted_index") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -152,6 +155,7 @@ suite("test_bitmap_index", "inverted_index") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -203,6 +207,7 @@ suite("test_bitmap_index", "inverted_index") { while (max_try_secs--) { String res = getJobState(tbName3) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) @@ -223,6 +228,7 @@ suite("test_bitmap_index", "inverted_index") { while (max_try_secs--) { String res = getJobState(tbName3) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(1000) diff --git a/regression-test/suites/nereids_syntax_p0/rollup.groovy b/regression-test/suites/nereids_syntax_p0/rollup.groovy index b3b761d693..0b293b3fa8 100644 --- a/regression-test/suites/nereids_syntax_p0/rollup.groovy +++ b/regression-test/suites/nereids_syntax_p0/rollup.groovy @@ -50,6 +50,7 @@ suite("rollup") { while (max_try_secs--) { String res = getJobRollupState("rollup_t1") if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/nereids_syntax_p0/test_materialized_view_nereids.groovy b/regression-test/suites/nereids_syntax_p0/test_materialized_view_nereids.groovy index fb78f19399..6e670f78f2 100644 --- a/regression-test/suites/nereids_syntax_p0/test_materialized_view_nereids.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_materialized_view_nereids.groovy @@ -50,6 +50,7 @@ suite("test_materialized_view_nereids") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -64,6 +65,7 @@ suite("test_materialized_view_nereids") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -101,6 +103,7 @@ suite("test_materialized_view_nereids") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup/test_materialized_view_bitmap.groovy b/regression-test/suites/rollup/test_materialized_view_bitmap.groovy index 992c1b26fe..744ebbaea9 100644 --- a/regression-test/suites/rollup/test_materialized_view_bitmap.groovy +++ b/regression-test/suites/rollup/test_materialized_view_bitmap.groovy @@ -36,6 +36,7 @@ suite("test_materialized_view_bitmap", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup/test_materialized_view_date.groovy b/regression-test/suites/rollup/test_materialized_view_date.groovy index 7ec17aeb3b..504a6575a3 100644 --- a/regression-test/suites/rollup/test_materialized_view_date.groovy +++ b/regression-test/suites/rollup/test_materialized_view_date.groovy @@ -42,6 +42,7 @@ suite("test_materialized_view_date", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -57,6 +58,7 @@ suite("test_materialized_view_date", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -72,6 +74,7 @@ suite("test_materialized_view_date", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -87,6 +90,7 @@ suite("test_materialized_view_date", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup/test_materialized_view_hll.groovy b/regression-test/suites/rollup/test_materialized_view_hll.groovy index f8b66e34bb..c38c0d1c4f 100644 --- a/regression-test/suites/rollup/test_materialized_view_hll.groovy +++ b/regression-test/suites/rollup/test_materialized_view_hll.groovy @@ -38,6 +38,7 @@ suite("test_materialized_view_hll", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup/test_materialized_view_hll_with_light_sc.groovy b/regression-test/suites/rollup/test_materialized_view_hll_with_light_sc.groovy index d5d733d02f..8775cce7cd 100644 --- a/regression-test/suites/rollup/test_materialized_view_hll_with_light_sc.groovy +++ b/regression-test/suites/rollup/test_materialized_view_hll_with_light_sc.groovy @@ -38,6 +38,7 @@ suite("test_materialized_view_hll_with_light_sc", "rollup") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup_p0/test_materialized_view.groovy b/regression-test/suites/rollup_p0/test_materialized_view.groovy index 58b1d454ff..21a957747f 100644 --- a/regression-test/suites/rollup_p0/test_materialized_view.groovy +++ b/regression-test/suites/rollup_p0/test_materialized_view.groovy @@ -49,6 +49,7 @@ suite("test_materialized_view") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -63,6 +64,7 @@ suite("test_materialized_view") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -95,6 +97,7 @@ suite("test_materialized_view") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup_p0/test_rollup_add_column.groovy b/regression-test/suites/rollup_p0/test_rollup_add_column.groovy index 5f25bb0b8e..18e30deff6 100644 --- a/regression-test/suites/rollup_p0/test_rollup_add_column.groovy +++ b/regression-test/suites/rollup_p0/test_rollup_add_column.groovy @@ -45,6 +45,7 @@ suite("test_rollup_add_column") { while (max_try_secs--) { String res = getJobRollupState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -61,6 +62,7 @@ suite("test_rollup_add_column") { while (max_try_secs--) { String res = getJobColumnState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup_p0/test_rollup_agg.groovy b/regression-test/suites/rollup_p0/test_rollup_agg.groovy index 730ee1b8e5..d5d4988dc1 100644 --- a/regression-test/suites/rollup_p0/test_rollup_agg.groovy +++ b/regression-test/suites/rollup_p0/test_rollup_agg.groovy @@ -42,6 +42,7 @@ suite("test_rollup_agg") { while (max_try_secs--) { String res = getJobRollupState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -57,6 +58,7 @@ suite("test_rollup_agg") { while (max_try_secs--) { String res = getJobColumnState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/rollup_p0/test_rollup_agg_date.groovy b/regression-test/suites/rollup_p0/test_rollup_agg_date.groovy index a65a03a97b..8b3d6865a4 100644 --- a/regression-test/suites/rollup_p0/test_rollup_agg_date.groovy +++ b/regression-test/suites/rollup_p0/test_rollup_agg_date.groovy @@ -45,6 +45,7 @@ suite("test_rollup_agg_date", "rollup") { while (max_try_secs--) { String res = getJobRollupState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -60,6 +61,7 @@ suite("test_rollup_agg_date", "rollup") { while (max_try_secs--) { String res = getJobColumnState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy index c3c86309ee..1c7c559454 100644 --- a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy +++ b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy @@ -51,6 +51,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -71,6 +72,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -115,6 +117,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -135,6 +138,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -158,6 +162,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -199,6 +204,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -219,6 +225,7 @@ suite("test_alter_table_column_with_delete_drop_column_dup_key", "schema_change" while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) diff --git a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy index fe214854c3..6a2cf4144e 100644 --- a/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy +++ b/regression-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy @@ -52,6 +52,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -72,6 +73,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -116,6 +118,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -136,6 +139,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) @@ -159,6 +163,7 @@ suite("test_alter_table_column_with_delete_drop_column_unique_key", "schema_chan while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(100) diff --git a/regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy b/regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy index 9f1e3b445e..ca2cb666db 100644 --- a/regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy +++ b/regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy @@ -48,6 +48,7 @@ suite("test_schema_change_datev2_with_delete") { while(max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -63,6 +64,7 @@ suite("test_schema_change_datev2_with_delete") { while(max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -78,6 +80,7 @@ suite("test_schema_change_datev2_with_delete") { while(max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change/test_schema_change_with_delete.groovy b/regression-test/suites/schema_change/test_schema_change_with_delete.groovy index df33358ed0..428fa13161 100644 --- a/regression-test/suites/schema_change/test_schema_change_with_delete.groovy +++ b/regression-test/suites/schema_change/test_schema_change_with_delete.groovy @@ -52,6 +52,7 @@ suite("test_schema_change_with_delete") { while(max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy b/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy index 05dbb36d7f..a890791287 100644 --- a/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy +++ b/regression-test/suites/schema_change_p0/datev2/test_agg_keys_schema_change_datev2.groovy @@ -136,6 +136,7 @@ suite("test_agg_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -157,6 +158,7 @@ suite("test_agg_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -185,6 +187,7 @@ suite("test_agg_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -206,6 +209,7 @@ suite("test_agg_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -234,6 +238,7 @@ suite("test_agg_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -263,6 +268,7 @@ suite("test_agg_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.groovy b/regression-test/suites/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.groovy index 966eb2b811..0af2d1f396 100644 --- a/regression-test/suites/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.groovy +++ b/regression-test/suites/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.groovy @@ -131,6 +131,7 @@ suite("test_dup_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -158,6 +159,7 @@ suite("test_dup_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -185,6 +187,7 @@ suite("test_dup_keys_schema_change_datev2") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy b/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy index 497d16efd5..3290141987 100644 --- a/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy +++ b/regression-test/suites/schema_change_p0/decimalv3/test_agg_keys_schema_change_decimalv3.groovy @@ -125,6 +125,7 @@ suite("test_agg_keys_schema_change_decimalv3") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -143,6 +144,7 @@ suite("test_agg_keys_schema_change_decimalv3") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -159,6 +161,7 @@ suite("test_agg_keys_schema_change_decimalv3") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -176,6 +179,7 @@ suite("test_agg_keys_schema_change_decimalv3") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -193,6 +197,7 @@ suite("test_agg_keys_schema_change_decimalv3") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy b/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy index 2de2886a85..aa4e6d6b6c 100644 --- a/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy @@ -105,6 +105,7 @@ suite ("test_agg_keys_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -159,6 +160,7 @@ suite ("test_agg_keys_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_agg_mv_schema_change.groovy b/regression-test/suites/schema_change_p0/test_agg_mv_schema_change.groovy index 230bfd75e0..3e4ab7e280 100644 --- a/regression-test/suites/schema_change_p0/test_agg_mv_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_agg_mv_schema_change.groovy @@ -91,6 +91,7 @@ suite ("test_agg_mv_schema_change") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -124,6 +125,7 @@ suite ("test_agg_mv_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_agg_rollup_schema_change.groovy b/regression-test/suites/schema_change_p0/test_agg_rollup_schema_change.groovy index 7439066c81..158f8bd4d2 100644 --- a/regression-test/suites/schema_change_p0/test_agg_rollup_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_agg_rollup_schema_change.groovy @@ -92,6 +92,7 @@ suite ("test_agg_rollup_schema_change") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -125,6 +126,7 @@ suite ("test_agg_rollup_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_alter_table_column.groovy b/regression-test/suites/schema_change_p0/test_alter_table_column.groovy index 56fb531074..0fcba89481 100644 --- a/regression-test/suites/schema_change_p0/test_alter_table_column.groovy +++ b/regression-test/suites/schema_change_p0/test_alter_table_column.groovy @@ -42,6 +42,7 @@ suite("test_alter_table_column") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -61,6 +62,7 @@ suite("test_alter_table_column") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -97,6 +99,7 @@ suite("test_alter_table_column") { while (max_try_secs--) { String res = getJobState(tbName2) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -203,6 +206,7 @@ suite("test_alter_table_column") { while (max_try_secs--) { String res = getJobState(tbName3) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/schema_change_p0/test_alter_table_column_nullable.groovy b/regression-test/suites/schema_change_p0/test_alter_table_column_nullable.groovy index 0397983743..55b9d247d6 100644 --- a/regression-test/suites/schema_change_p0/test_alter_table_column_nullable.groovy +++ b/regression-test/suites/schema_change_p0/test_alter_table_column_nullable.groovy @@ -50,6 +50,7 @@ suite("test_alter_table_column_nullable") { while (max_try_secs--) { String res = getJobState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -86,6 +87,7 @@ suite("test_alter_table_column_nullable") { while (max_try_secs--) { String res = getJobState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -153,6 +155,7 @@ suite("test_alter_table_column_nullable") { while (max_try_secs--) { String res = getJobState(tbName) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) diff --git a/regression-test/suites/schema_change_p0/test_alter_table_column_with_delete.groovy b/regression-test/suites/schema_change_p0/test_alter_table_column_with_delete.groovy index 9305cf626b..e3213e2a09 100644 --- a/regression-test/suites/schema_change_p0/test_alter_table_column_with_delete.groovy +++ b/regression-test/suites/schema_change_p0/test_alter_table_column_with_delete.groovy @@ -47,6 +47,7 @@ suite("test_alter_table_column_with_delete") { while (max_try_secs--) { String res = getJobState(tbName1) if (res == "FINISHED") { + sleep(3000) break } else { Thread.sleep(500) diff --git a/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy b/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy index 19329ab37d..207a19928e 100644 --- a/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_keys_schema_change.groovy @@ -130,6 +130,7 @@ suite ("test_dup_keys_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy b/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy index cb9bd44f3b..e4e171e86d 100644 --- a/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_mv_schema_change.groovy @@ -91,6 +91,7 @@ suite ("test_dup_mv_schema_change") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -150,6 +151,7 @@ suite ("test_dup_mv_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy b/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy index e232fbf715..fb809f4f05 100644 --- a/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_rollup_schema_change.groovy @@ -90,6 +90,7 @@ suite ("test_dup_rollup_schema_change") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -147,6 +148,7 @@ suite ("test_dup_rollup_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_rename_column.groovy b/regression-test/suites/schema_change_p0/test_rename_column.groovy index af95037427..59d778c557 100644 --- a/regression-test/suites/schema_change_p0/test_rename_column.groovy +++ b/regression-test/suites/schema_change_p0/test_rename_column.groovy @@ -152,6 +152,7 @@ suite ("test_rename_column") { while (max_try_time--){ String result = getRollupJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -217,6 +218,7 @@ suite ("test_rename_column") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_schema_change.groovy b/regression-test/suites/schema_change_p0/test_schema_change.groovy index fd1479f121..e41a20c87f 100644 --- a/regression-test/suites/schema_change_p0/test_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_schema_change.groovy @@ -50,6 +50,7 @@ suite("test_schema_change") { while (max_try_time--){ String result = getJobState(tbName) if (result == "FINISHED") { + sleep(3000) qt_desc_uniq_table """ desc ${tbName} """ qt_sql """ SELECT * FROM ${tbName} order by event_day,citycode """ sql """ DROP TABLE ${tbName} """ diff --git a/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy b/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy index 9cbc558286..df365ad01a 100644 --- a/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_uniq_mv_schema_change.groovy @@ -86,6 +86,7 @@ suite ("test_uniq_mv_schema_change") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy b/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy index a7ae2142ea..0ea05d2316 100644 --- a/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_uniq_rollup_schema_change.groovy @@ -90,6 +90,7 @@ suite ("test_uniq_rollup_schema_change") { while (max_try_time--){ String result = getMVJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) @@ -151,6 +152,7 @@ suite ("test_uniq_rollup_schema_change") { while (max_try_time--){ String result = getJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { sleep(100) diff --git a/regression-test/suites/schema_change_p0/test_update_schema_change.groovy b/regression-test/suites/schema_change_p0/test_update_schema_change.groovy index 0898674860..e0d15f247a 100644 --- a/regression-test/suites/schema_change_p0/test_update_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_update_schema_change.groovy @@ -61,6 +61,7 @@ suite ("test_update_schema_change") { while (max_try_secs--) { String result = getAlterColumnJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) @@ -107,6 +108,7 @@ suite ("test_update_schema_change") { while (max_try_secs--) { String result = getAlterColumnJobState(tableName) if (result == "FINISHED") { + sleep(3000) break } else { Thread.sleep(2000) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org