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 43bfca9ba52 branch-2.1: [test](move-memtable) mitigate flaky injection
test `skip_two_backends` #47082 (#47111)
43bfca9ba52 is described below
commit 43bfca9ba526f6c53848ade1ec2c40ed5fe1de4f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 17 20:48:09 2025 +0800
branch-2.1: [test](move-memtable) mitigate flaky injection test
`skip_two_backends` #47082 (#47111)
Cherry-picked from #47082
Co-authored-by: Kaijie Chen <chenkai...@selectdb.com>
---
.../fault_injection_p0/test_multi_replica_fault_injection.groovy | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/regression-test/suites/fault_injection_p0/test_multi_replica_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_multi_replica_fault_injection.groovy
index d09983d52d0..4e235daf97c 100644
---
a/regression-test/suites/fault_injection_p0/test_multi_replica_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_multi_replica_fault_injection.groovy
@@ -75,7 +75,7 @@ suite("test_multi_replica_fault_injection", "nonConcurrent") {
file "baseall.txt"
}
- def load_with_injection = { injection, error_msg, success=false->
+ def load_with_injection = { injection, error_msg, success=false,
alt_error_msg=null->
try {
sql "truncate table test"
GetDebugPoint().enableDebugPointForAllBEs(injection)
@@ -83,7 +83,8 @@ suite("test_multi_replica_fault_injection", "nonConcurrent") {
assertTrue(success, String.format("Expected Exception '%s',
actual success", error_msg))
} catch(Exception e) {
logger.info(e.getMessage())
- assertTrue(e.getMessage().contains(error_msg), e.toString())
+ boolean e_contains_alt_error_msg = (alt_error_msg != null &&
e.getMessage().contains(alt_error_msg))
+ assertTrue(e.getMessage().contains(error_msg) ||
e_contains_alt_error_msg, e.toString())
} finally {
GetDebugPoint().disableDebugPointForAllBEs(injection)
}
@@ -101,7 +102,7 @@ suite("test_multi_replica_fault_injection",
"nonConcurrent") {
// test one backend open failure
load_with_injection("VTabletWriterV2._open_streams.skip_one_backend",
"success", true)
// test two backend open failure
- load_with_injection("VTabletWriterV2._open_streams.skip_two_backends",
"not enough streams 1/3")
+ load_with_injection("VTabletWriterV2._open_streams.skip_two_backends",
"not enough streams 1/3", false, "succ replica num 1 < load required replica
num 2")
sql """ set enable_memtable_on_sink_node=false """
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
