This is an automated email from the ASF dual-hosted git repository.
liaoxin 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 2bb29d7f365 [fix](test) fix move memtable injection test may cause
other case stuck #40356 (#42508)
2bb29d7f365 is described below
commit 2bb29d7f365473cff2339fa43c20c2e3edbbaafd
Author: Xin Liao <liaoxin...@126.com>
AuthorDate: Sat Oct 26 23:11:45 2024 +0800
[fix](test) fix move memtable injection test may cause other case stuck
#40356 (#42508)
cherry pick from #40356
---------
Co-authored-by: hui lai <1353307...@qq.com>
---
be/src/olap/delta_writer_v2.cpp | 2 +-
regression-test/pipeline/p0/conf/regression-conf.groovy | 1 -
.../test_delta_writer_v2_back_pressure_fault_injection.groovy | 4 +++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/delta_writer_v2.cpp b/be/src/olap/delta_writer_v2.cpp
index 9d573ce308c..32baa93be1f 100644
--- a/be/src/olap/delta_writer_v2.cpp
+++ b/be/src/olap/delta_writer_v2.cpp
@@ -153,7 +153,7 @@ Status DeltaWriterV2::write(const vectorized::Block* block,
const std::vector<ui
SCOPED_RAW_TIMER(&_wait_flush_limit_time);
auto memtable_flush_running_count_limit =
config::memtable_flush_running_count_limit;
DBUG_EXECUTE_IF("DeltaWriterV2.write.back_pressure",
- { memtable_flush_running_count_limit = 0; });
+ {
std::this_thread::sleep_for(std::chrono::milliseconds(10 * 1000)); });
while (_memtable_writer->flush_running_count() >=
memtable_flush_running_count_limit) {
if (_state->is_cancelled()) {
return Status::Cancelled(_state->cancel_reason());
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/p0/conf/regression-conf.groovy
index 0412cfa7487..741cec08ce5 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -70,7 +70,6 @@ excludeSuites = "000_the_start_sentinel_do_not_touch," + //
keep this line as th
"test_spark_load," +
"test_broker_load_func," +
"test_stream_stub_fault_injection," +
- "test_delta_writer_v2_back_pressure_fault_injection," +
"zzz_the_end_sentinel_do_not_touch" // keep this line as the last line
// this directories will not be executed
diff --git
a/regression-test/suites/fault_injection_p0/test_delta_writer_v2_back_pressure_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_delta_writer_v2_back_pressure_fault_injection.groovy
index ea9e9ffb8bb..07cda8db41e 100644
---
a/regression-test/suites/fault_injection_p0/test_delta_writer_v2_back_pressure_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_delta_writer_v2_back_pressure_fault_injection.groovy
@@ -98,9 +98,11 @@ suite("test_delta_writer_v2_back_pressure_fault_injection",
"nonConcurrent") {
}
} catch(Exception e) {
logger.info(e.getMessage())
+ } finally {
+
GetDebugPoint().disableDebugPointForAllBEs("DeltaWriterV2.write.back_pressure")
}
sql """ DROP TABLE IF EXISTS `baseall` """
sql """ DROP TABLE IF EXISTS `test` """
sql """ set enable_memtable_on_sink_node=false """
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
