This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3ed73418e38 [fix](recycler) Fix recycler cases (#56511)
3ed73418e38 is described below
commit 3ed73418e38349651939aa71b23fd13b906a9bb3
Author: Yixuan Wang <[email protected]>
AuthorDate: Sat Sep 27 22:02:22 2025 +0800
[fix](recycler) Fix recycler cases (#56511)
---
.../src/main/groovy/org/apache/doris/regression/Config.groovy | 9 +++++++++
regression-test/plugins/cloud_recycler_plugin.groovy | 1 +
regression-test/suites/cloud_p0/recycler/test_checker.groovy | 1 +
regression-test/suites/cloud_p0/recycler/test_recycler.groovy | 2 +-
.../cloud_p0/recycler/test_recycler_with_internal_copy.groovy | 2 +-
5 files changed, 13 insertions(+), 2 deletions(-)
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 e0e63d0037b..3cc4ba72b71 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/plugins/cloud_recycler_plugin.groovy
b/regression-test/plugins/cloud_recycler_plugin.groovy
index 1a9fbe2f4a5..bdd2f9d2f18 100644
--- a/regression-test/plugins/cloud_recycler_plugin.groovy
+++ b/regression-test/plugins/cloud_recycler_plugin.groovy
@@ -118,6 +118,7 @@ Suite.metaClass.checkRecycleTable = { String token, String
instanceId, String cl
suite.getLogger().info(getObjStoreInfoApiResult.result.toString())
if (getObjStoreInfoApiResult.result.toString().contains("storage_vault=[")
&& getObjStoreInfoApiResult.result.toString().contains("hdfs_info")) {
+ System.setProperty("java.security.krb5.conf", "/etc/krb/krb5.conf")
String fsUri =
getObjStoreInfoApiResult.result.storage_vault[0].hdfs_info.build_conf.fs_name
String prefix =
getObjStoreInfoApiResult.result.storage_vault[0].hdfs_info.prefix
String kbsPrincipal = ''
diff --git a/regression-test/suites/cloud_p0/recycler/test_checker.groovy
b/regression-test/suites/cloud_p0/recycler/test_checker.groovy
index 0b0822bd734..ee07c15078c 100644
--- a/regression-test/suites/cloud_p0/recycler/test_checker.groovy
+++ b/regression-test/suites/cloud_p0/recycler/test_checker.groovy
@@ -106,6 +106,7 @@ suite("test_checker") {
logger.info("delete objectKey: ${objectKey}")
s3Client.deleteObject(new DeleteObjectRequest(bucket, objectKey))
} else if
(getObjStoreInfoApiResult.result.toString().contains("storage_vault=[") &&
getObjStoreInfoApiResult.result.toString().contains("hdfs_info")) {
+ System.setProperty("java.security.krb5.conf", "/etc/krb/krb5.conf")
String fsUri =
getObjStoreInfoApiResult.result.storage_vault[0].hdfs_info.build_conf.fs_name
String prefix =
getObjStoreInfoApiResult.result.storage_vault[0].hdfs_info.prefix
String hdfsPath = "/${prefix}/data/${tabletId}/"
diff --git a/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
b/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
index 02356ec1ec5..ec4863ef381 100644
--- a/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
+++ b/regression-test/suites/cloud_p0/recycler/test_recycler.groovy
@@ -97,7 +97,7 @@ suite("test_recycler") {
triggerCheckerApi.call() {
respCode, body ->
log.info("http cli result: ${body} ${respCode}".toString())
- triggerCheckerResult = body
+ def triggerCheckerResult = body
logger.info("triggerCheckerResult:${triggerCheckerResult}".toString())
assertTrue(triggerCheckerResult.trim().equalsIgnoreCase("OK"))
}
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]
