This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new e59a866d6a3 [fix](test)Fix unstable index compaction fault injection
case (#38501) (#38673)
e59a866d6a3 is described below
commit e59a866d6a39d822d7997e9cafe30c89637e7403
Author: qiye <[email protected]>
AuthorDate: Thu Aug 1 18:58:51 2024 +0800
[fix](test)Fix unstable index compaction fault injection case (#38501)
(#38673)
## Proposed changes
bp #38501
---
.../test_index_compaction_fault_injection.groovy | 7 +++++--
.../index_compaction/test_index_compaction_dup_keys.groovy | 2 +-
.../index_compaction/test_index_compaction_null.groovy | 6 ++++--
.../index_compaction/test_index_compaction_unique_keys.groovy | 3 ++-
.../test_index_compaction_with_multi_index_segments.groovy | 6 ++++--
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git
a/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
index 9a117625082..13dceea5a39 100644
---
a/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_index_compaction_fault_injection.groovy
@@ -143,6 +143,7 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
GetDebugPoint().enableDebugPointForAllBEs("index_compaction_compact_column_throw_error")
logger.info("trigger_full_compaction_on_tablets with fault
injection: index_compaction_compact_column_throw_error")
trigger_full_compaction_on_tablets.call(tablets)
+ wait_full_compaction_done.call(tablets)
} finally {
GetDebugPoint().disableDebugPointForAllBEs("index_compaction_compact_column_throw_error")
}
@@ -178,6 +179,7 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
GetDebugPoint().enableDebugPointForAllBEs("index_compaction_compact_column_status_not_ok")
logger.info("trigger_full_compaction_on_tablets with fault
injection: index_compaction_compact_column_status_not_ok")
trigger_full_compaction_on_tablets.call(tablets)
+ wait_full_compaction_done.call(tablets)
} finally {
GetDebugPoint().disableDebugPointForAllBEs("index_compaction_compact_column_status_not_ok")
}
@@ -269,7 +271,7 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
DUPLICATE KEY(`id`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`id`) BUCKETS 1
- PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true");
+ PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true", "inverted_index_storage_format" = "V1");
"""
//TabletId,ReplicaId,BackendId,SchemaHash,Version,LstSuccessVersion,LstFailedVersion,LstFailedTime,LocalDataSize,RemoteDataSize,RowCount,State,LstConsistencyCheckTime,CheckVersion,VersionCount,PathHash,MetaUrl,CompactionStatus
@@ -299,7 +301,8 @@ suite("test_index_compaction_failure_injection",
"nonConcurrent") {
PROPERTIES (
"replication_num" = "1",
"disable_auto_compaction" = "true",
- "enable_unique_key_merge_on_write" = "true"
+ "enable_unique_key_merge_on_write" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
index 73a7cd46663..90281c7f537 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_dup_keys.groovy
@@ -146,7 +146,7 @@ suite("test_index_compaction_dup_keys", "nonConcurrent") {
DUPLICATE KEY(`id`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`id`) BUCKETS 1
- PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true");
+ PROPERTIES ( "replication_num" = "1", "disable_auto_compaction" =
"true", "inverted_index_storage_format" = "V1");
"""
sql """ INSERT INTO ${tableName} VALUES (1, "andy", "andy love apple",
100); """
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
index 849aaa50763..b014f10142c 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_null.groovy
@@ -255,7 +255,8 @@ suite("test_index_compaction_null", "nonConcurrent") {
"replication_allocation" = "tag.location.default: 1",
"disable_auto_compaction" = "true",
"in_memory" = "false",
- "storage_format" = "V2"
+ "storage_format" = "V2",
+ "inverted_index_storage_format" = "V1"
)
"""
@@ -290,7 +291,8 @@ suite("test_index_compaction_null", "nonConcurrent") {
"disable_auto_compaction" = "true",
"enable_unique_key_merge_on_write" = "true",
"in_memory" = "false",
- "storage_format" = "V2"
+ "storage_format" = "V2",
+ "inverted_index_storage_format" = "V1"
)
"""
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
index 2ce46aafece..3c30638a528 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_unique_keys.groovy
@@ -149,7 +149,8 @@ suite("test_index_compaction_unique_keys", "nonConcurrent")
{
PROPERTIES (
"replication_num" = "1",
"disable_auto_compaction" = "true",
- "enable_unique_key_merge_on_write" = "true"
+ "enable_unique_key_merge_on_write" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
index d4f3b2b1a25..51408ef98c6 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
@@ -159,7 +159,8 @@ suite("test_index_compaction_with_multi_index_segments",
"nonConcurrent") {
DISTRIBUTED BY RANDOM BUCKETS 1
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
- "disable_auto_compaction" = "true"
+ "disable_auto_compaction" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
@@ -279,7 +280,8 @@ suite("test_index_compaction_with_multi_index_segments",
"nonConcurrent") {
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
"disable_auto_compaction" = "true",
- "enable_unique_key_merge_on_write" = "true"
+ "enable_unique_key_merge_on_write" = "true",
+ "inverted_index_storage_format" = "V1"
);
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
