Skip to content

[enhancement](regression-test) add sleep 3s for schema change and rollup #17484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gabriel39 merged 2 commits into from
Mar 8, 2023
Merged

[enhancement](regression-test) add sleep 3s for schema change and rollup #17484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58cd7db
[enhancement](regression-test) add sleep 3s for schema change and rollup
Doris-Extras Mar 7, 2023
b018408
f
Doris-Extras Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,9 @@ private boolean tryLock(boolean mustLock) {
// 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));
}
}

Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/datatype_p0/date/test_default_current_timestamp.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions regression-test/suites/index_p0/test_bitmap_index.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions regression-test/suites/inverted_index_p0/test_bitmap_index.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/nereids_syntax_p0/rollup.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions regression-test/suites/nereids_syntax_p0/test_materialized_view_nereids.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/rollup/test_materialized_view_bitmap.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions regression-test/suites/rollup/test_materialized_view_date.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/rollup/test_materialized_view_hll.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/rollup/test_materialized_view_hll_with_light_sc.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions regression-test/suites/rollup_p0/test_materialized_view.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions regression-test/suites/rollup_p0/test_rollup_add_column.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions regression-test/suites/rollup_p0/test_rollup_agg.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions regression-test/suites/rollup_p0/test_rollup_agg_date.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions ...-test/suites/schema_change/test_alter_table_column_with_delete_drop_column_dup_key.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions ...st/suites/schema_change/test_alter_table_column_with_delete_drop_column_unique_key.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
Loading