This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 0ddf2958b32 [fix](trash) Fix `clean_trash` docker regression case
#40925 (#44280)
0ddf2958b32 is described below
commit 0ddf2958b3215bd327a4739bff7e4f23247e8bcc
Author: deardeng <565620...@qq.com>
AuthorDate: Wed Nov 20 09:41:45 2024 +0800
[fix](trash) Fix `clean_trash` docker regression case #40925 (#44280)
cherry pick from #40925
---
regression-test/suites/trash_p0/clean_trash.groovy | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/regression-test/suites/trash_p0/clean_trash.groovy
b/regression-test/suites/trash_p0/clean_trash.groovy
index f5001fb0c2c..98e7e6d01e5 100644
--- a/regression-test/suites/trash_p0/clean_trash.groovy
+++ b/regression-test/suites/trash_p0/clean_trash.groovy
@@ -29,13 +29,15 @@ suite("test_clean_trash", "p0") {
options.beConfigs += [
'max_garbage_sweep_interval=2',
'min_garbage_sweep_interval=1',
- 'report_disk_state_interval_seconds=1'
+ 'report_disk_state_interval_seconds=1',
+ 'trash_file_expire_time_sec=600'
]
options.beNum = 3
docker(options) {
+
def checkFunc = { boolean trashZero ->
def succ = false
- for (int i=0; i < 300; ++i) {
+ dockerAwaitUntil(300) {
def bes = sql_return_maparray """show backends"""
succ = bes.every {
if (trashZero) {
@@ -44,10 +46,7 @@ suite("test_clean_trash", "p0") {
return !"0.000".equals((it.TrashUsedCapacity).trim())
}
}
- if (succ) {
- break;
- }
- sleep(1000)
+ succ
}
Assert.assertTrue(succ)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
