This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 8711405f457 [fix](recycler) Fix recycler cases (#56510)
8711405f457 is described below
commit 8711405f4579896c5e57179ad919f1924525f530
Author: Uniqueyou <[email protected]>
AuthorDate: Sat Sep 27 09:56:30 2025 +0800
[fix](recycler) Fix recycler cases (#56510)
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
.../src/main/groovy/org/apache/doris/regression/Config.groovy | 9 +++++++++
.../cloud_p0/recycler/test_recycler_with_internal_copy.groovy | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
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 33bc59854b1..3789c1d5d2a 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
@@ -200,6 +201,7 @@ class Config {
String cloudUniqueId,
String metaServiceHttpAddress,
String recycleServiceHttpAddress,
+ String recycleBeforeTest,
String suitePath,
String dataPath,
String realDataPath,
@@ -261,6 +263,7 @@ class Config {
this.cloudUniqueId = cloudUniqueId
this.metaServiceHttpAddress = metaServiceHttpAddress
this.recycleServiceHttpAddress = recycleServiceHttpAddress
+ this.recycleBeforeTest = recycleBeforeTest
this.suitePath = suitePath
this.dataPath = dataPath
this.realDataPath = realDataPath
@@ -611,6 +614,7 @@ class Config {
configToString(obj.cloudUniqueId),
configToString(obj.metaServiceHttpAddress),
configToString(obj.recycleServiceHttpAddress),
+ configToString(obj.recycleBeforeTest),
configToString(obj.suitePath),
configToString(obj.dataPath),
configToString(obj.realDataPath),
@@ -869,6 +873,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_with_internal_copy.groovy
b/regression-test/suites/cloud_p0/recycler/test_recycler_with_internal_copy.groovy
index bdcdaf514a9..eb1c408d3c6 100644
---
a/regression-test/suites/cloud_p0/recycler/test_recycler_with_internal_copy.groovy
+++
b/regression-test/suites/cloud_p0/recycler/test_recycler_with_internal_copy.groovy
@@ -23,7 +23,7 @@ suite("test_recycler_with_internal_copy") {
def tableName = "test_recycler_with_internal_copy"
def fileName = "test_recycler_with_internal_copy.csv"
- def filePath =
"${context.config.dataPath}/cloud/copy_into/internal_customer.csv"
+ def filePath =
"${context.config.dataPath}/cloud_p0/copy_into/internal_customer.csv"
StringBuilder strBuilder = new StringBuilder()
strBuilder.append("""curl -u """ + context.config.feCloudHttpUser + ":" +
context.config.feCloudHttpPassword)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
