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 1892ce4dbb4 branch-3.1: [fix](case) do not use global var in groovy
#55216 (#55226)
1892ce4dbb4 is described below
commit 1892ce4dbb4cd52cb00d244c2af5fc55756d9a8e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Aug 25 15:05:30 2025 +0800
branch-3.1: [fix](case) do not use global var in groovy #55216 (#55226)
Cherry-picked from #55216
Co-authored-by: Yongqiang YANG <[email protected]>
---
.../compaction10/test_schema_change_with_compaction10.groovy | 2 +-
.../compaction11/test_schema_change_with_compaction11.groovy | 5 ++++-
.../compaction6/test_schema_change_with_compaction6.groovy | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
index db3da9aa044..7e3d9d233cb 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction10/test_schema_change_with_compaction10.groovy
@@ -121,7 +121,7 @@ suite('test_schema_change_with_compaction10', 'docker') {
// cu compaction
trigger_and_wait_compaction("date", "cumulative")
} catch (Exception e) {
- logger.error("Exception: " + e)
+ logger.info("Exception: " + e)
} finally {
if (injectBe != null) {
GetDebugPoint().disableDebugPointForAllBEs(injectName)
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
index 310c10b4dbc..cb32e99a266 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction11/test_schema_change_with_compaction11.groovy
@@ -139,7 +139,10 @@ suite('test_schema_change_with_compaction11', 'docker') {
logger.info("Run compaction: code=" + code + ", out=" + out + ",
err=" + err)
assertTrue(out.contains("invalid tablet state."))
- } finally {
+ } catch (Exception e) {
+ logger.info("Exception: " + e)
+ }
+ finally {
if (injectBe != null) {
GetDebugPoint().disableDebugPointForAllBEs(injectName)
}
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction6/test_schema_change_with_compaction6.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction6/test_schema_change_with_compaction6.groovy
index 31a5760c62d..894f06bee13 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction6/test_schema_change_with_compaction6.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction6/test_schema_change_with_compaction6.groovy
@@ -124,7 +124,7 @@ suite('test_schema_change_with_compaction6', 'docker') {
// base compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_base_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_base_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ",
err=" + err)
@@ -169,7 +169,7 @@ suite('test_schema_change_with_compaction6', 'docker') {
}
} catch (Exception e) {
- logger.error("Exception: " + e)
+ logger.info("Exception: " + e)
} finally {
if (injectBe != null) {
GetDebugPoint().disableDebugPointForAllBEs(injectName)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
