This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 5ea66be7890 branch-3.1: [fix](recycler) Fix recycler cases #56511
(#57836)
5ea66be7890 is described below
commit 5ea66be7890026b0fef7b54252e5c1676580f7a0
Author: Yixuan Wang <[email protected]>
AuthorDate: Tue Nov 11 19:10:21 2025 +0800
branch-3.1: [fix](recycler) Fix recycler cases #56511 (#57836)
pick: #56511
---
regression-test/data/cloud_p0/copy_into/internal_customer.csv | 10 ++++++++++
.../src/main/groovy/org/apache/doris/regression/Config.groovy | 9 +++++++++
regression-test/suites/cloud_p0/recycler/test_recycler.groovy | 5 +++--
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/regression-test/data/cloud_p0/copy_into/internal_customer.csv
b/regression-test/data/cloud_p0/copy_into/internal_customer.csv
new file mode 100644
index 00000000000..7e8ae33ef6d
--- /dev/null
+++ b/regression-test/data/cloud_p0/copy_into/internal_customer.csv
@@ -0,0 +1,10 @@
+1|Customer#000000001|IVhzIApeRb ot,c,E|15|25-989-741-2988|711.56|BUILDING|to
the even, regular platelets. regular, ironic epitaphs nag e
+2|Customer#000000002|XSTf4,NCwDVaWNe6tEgvwfmRchLXak|13|23-768-687-3665|121.65|AUTOMOBILE|l
accounts. blithely ironic theodolites integrate boldly: caref
+3|Customer#000000003|MG9kdTD2WBHm|1|11-719-748-3364|7498.12|AUTOMOBILE|
deposits eat slyly ironic, even instructions. express foxes detect slyly.
blithely even accounts abov
+4|Customer#000000004|XxVSJsLAGtn|4|14-128-190-5944|2866.83|MACHINERY|
requests. final, regular ideas sleep final accou
+5|Customer#000000005|KvpyuHCplrB84WgAiGV6sYpZq7Tj|3|13-750-942-6364|794.47|HOUSEHOLD|n
accounts will have to unwind. foxes cajole accor
+6|Customer#000000006|sKZz0CsnMD7mp4Xd0YrBvx,LREYKUWAh
yVn|20|30-114-968-4951|7638.57|AUTOMOBILE|tions. even deposits boost according
to the slyly bold packages. final accounts cajole requests. furious
+7|Customer#000000007|TcGe5gaZNgVePxU5kRrvXBfkasDTea|18|28-190-982-9759|9561.95|AUTOMOBILE|ainst
the ironic, express theodolites. express, even pinto beans among the exp
+8|Customer#000000008|I0B10bB0AymmC,
0PrRYBCP1yGJ8xcBPmWhl5|17|27-147-574-9335|6819.74|BUILDING|among the slyly
regular theodolites kindle blithely courts. carefully even theodolites haggle
slyly along the ide
+9|Customer#000000009|xKiAFTjUsCuxfeleNqefumTrjS|8|18-338-906-3675|8324.07|FURNITURE|r
theodolites according to the requests wake thinly excuses: pending requests
haggle furiousl
+10|Customer#000000010|6LrEaV6KR6PLVcgl2ArL Q3rqzLzcT1
v2|5|15-741-346-9870|2753.54|HOUSEHOLD|es regular deposits haggle. fur
\ No newline at end of file
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index bccd3b585c3..c42071cf3c0 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -70,6 +70,7 @@ class Config {
public String cloudUniqueId
public String metaServiceHttpAddress
public String recycleServiceHttpAddress
+ public String recycleBeforeTest
public RunMode runMode = RunMode.UNKNOWN
@@ -201,6 +202,7 @@ class Config {
String cloudUniqueId,
String metaServiceHttpAddress,
String recycleServiceHttpAddress,
+ String recycleBeforeTest,
String suitePath,
String dataPath,
String realDataPath,
@@ -263,6 +265,7 @@ class Config {
this.cloudUniqueId = cloudUniqueId
this.metaServiceHttpAddress = metaServiceHttpAddress
this.recycleServiceHttpAddress = recycleServiceHttpAddress
+ this.recycleBeforeTest = recycleBeforeTest
this.suitePath = suitePath
this.dataPath = dataPath
this.realDataPath = realDataPath
@@ -615,6 +618,7 @@ class Config {
configToString(obj.cloudUniqueId),
configToString(obj.metaServiceHttpAddress),
configToString(obj.recycleServiceHttpAddress),
+ configToString(obj.recycleBeforeTest),
configToString(obj.suitePath),
configToString(obj.dataPath),
configToString(obj.realDataPath),
@@ -874,6 +878,11 @@ class Config {
log.info("Set recycleServiceHttpAddress to
'${config.recycleServiceHttpAddress}' because not specify.".toString())
}
+ if (config.recycleBeforeTest == null) {
+ config.recycleBeforeTest = "false"
+ log.info("Set recycleBeforeTest to '${config.recycleBeforeTest}'
because not specify.".toString())
+ }
+
if (config.feSyncerUser == null) {
config.feSyncerUser = "root"
log.info("Set feSyncerUser to '${config.feSyncerUser}' because not
specify.".toString())
diff --git a/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
b/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
index 61a784b9b4c..857fad9023c 100644
--- a/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
+++ b/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
@@ -45,7 +45,8 @@ suite("test_recycler") {
def info = parseJson(recycleJobInfoResult.trim())
if (info.last_finish_time_ms != null) {
recyclerLastFinishTime =
Long.parseLong(info.last_finish_time_ms)
- assertTrue(info.last_success_time_ms != null)
+ }
+ if(info.last_success_time_ms != null) {
recyclerLastSuccessTime =
Long.parseLong(info.last_success_time_ms)
}
}
@@ -56,7 +57,7 @@ suite("test_recycler") {
Thread.sleep(10000)
getRecycleJobInfo()
logger.info("caseStartTime=${caseStartTime},
recyclerLastSuccessTime=${recyclerLastSuccessTime}")
- if (recyclerLastFinishTime > caseStartTime) {
+ if (recyclerLastSuccessTime > caseStartTime) {
break
}
} while (true)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
