This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 416a838d0dd branch-3.0: [fix](case) do not use global var in groovy
#54319 (#54327)
416a838d0dd is described below
commit 416a838d0dd429ae7b1b746bd45abc9f629e5f2b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 5 17:02:34 2025 +0800
branch-3.0: [fix](case) do not use global var in groovy #54319 (#54327)
Cherry-picked from #54319
Co-authored-by: Yongqiang YANG <[email protected]>
---
.../compaction1/test_schema_change_with_compaction1.groovy | 8 ++++++--
.../compaction10/test_schema_change_with_compaction10.groovy | 7 +++++--
.../compaction2/test_schema_change_with_compaction2.groovy | 10 +++++++---
.../compaction3/test_schema_change_with_compaction3.groovy | 10 +++++++---
.../compaction4/test_schema_change_with_compaction4.groovy | 10 +++++++---
.../compaction5/test_schema_change_with_compaction5.groovy | 9 ++++++---
.../compaction6/test_schema_change_with_compaction6.groovy | 7 +++++--
.../compaction7/test_schema_change_with_compaction7.groovy | 10 +++++++---
.../compaction8/test_schema_change_with_compaction8.groovy | 10 +++++++---
.../compaction9/test_schema_change_with_compaction9.groovy | 6 +++---
10 files changed, 60 insertions(+), 27 deletions(-)
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction1/test_schema_change_with_compaction1.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction1/test_schema_change_with_compaction1.groovy
index ed78edd6ca8..64b03d8cb66 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction1/test_schema_change_with_compaction1.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction1/test_schema_change_with_compaction1.groovy
@@ -29,6 +29,7 @@ import org.apache.doris.regression.util.NodeType
suite('test_schema_change_with_compaction1', 'nonConcurrent') {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE COLUMN WHERE
IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
+ logger.info("jobStateResult: " + jobStateResult)
return jobStateResult[0][9]
}
@@ -57,6 +58,7 @@ suite('test_schema_change_with_compaction1', 'nonConcurrent')
{
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() - 1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel} failed.")
@@ -107,13 +109,15 @@ suite('test_schema_change_with_compaction1',
'nonConcurrent') {
trigger_and_wait_compaction("date", "base")
def newTabletId = array[1].TabletId
logger.info("run compaction:" + newTabletId)
- (code, out, err) = be_run_base_compaction(injectBe.Host,
injectBe.HttpPort, newTabletId)
+ def (code, out, err) = be_run_base_compaction(injectBe.Host,
injectBe.HttpPort, newTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
assertTrue(out.contains("invalid tablet state."))
// cu compaction
trigger_and_wait_compaction("date", "cumulative")
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
DebugPoint.disableDebugPoint(injectBe.Host,
injectBe.HttpPort.toInteger(), NodeType.BE, injectName)
@@ -136,7 +140,7 @@ suite('test_schema_change_with_compaction1',
'nonConcurrent') {
assertEquals(count[0][0], 23004);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" + err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
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 b7b6bd4e433..2e9ad0628d4 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
@@ -60,6 +60,7 @@ suite('test_schema_change_with_compaction10', 'docker') {
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() -
1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel}
failed.")
@@ -113,12 +114,14 @@ suite('test_schema_change_with_compaction10', 'docker') {
trigger_and_wait_compaction("date", "base")
def newTabletId = array[1].TabletId
logger.info("run compaction:" + newTabletId)
- (code, out, err) = be_run_base_compaction(injectBe.Host,
injectBe.HttpPort, newTabletId)
+ def (code, out, err) = be_run_base_compaction(injectBe.Host,
injectBe.HttpPort, newTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ",
err=" + err)
assertTrue(out.contains("invalid tablet state."))
// cu compaction
trigger_and_wait_compaction("date", "cumulative")
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
GetDebugPoint().disableDebugPointForAllBEs(injectName)
@@ -141,7 +144,7 @@ suite('test_schema_change_with_compaction10', 'docker') {
assertEquals(count[0][0], 2556);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" +
err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction2/test_schema_change_with_compaction2.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction2/test_schema_change_with_compaction2.groovy
index c8ca8a54109..667a498d6c0 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction2/test_schema_change_with_compaction2.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction2/test_schema_change_with_compaction2.groovy
@@ -29,6 +29,7 @@ import org.apache.doris.regression.util.NodeType
suite('test_schema_change_with_compaction2', 'nonConcurrent') {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE COLUMN WHERE
IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
+ logger.info("jobStateResult: " + jobStateResult)
return jobStateResult[0][9]
}
@@ -57,6 +58,7 @@ suite('test_schema_change_with_compaction2', 'nonConcurrent')
{
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() - 1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel} failed.")
@@ -83,7 +85,7 @@ suite('test_schema_change_with_compaction2', 'nonConcurrent')
{
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
boolean running = true
do {
@@ -113,7 +115,7 @@ suite('test_schema_change_with_compaction2',
'nonConcurrent') {
// 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)
@@ -134,6 +136,8 @@ suite('test_schema_change_with_compaction2',
'nonConcurrent') {
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
assertTrue(out.contains("invalid tablet state."))
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
DebugPoint.disableDebugPoint(injectBe.Host,
injectBe.HttpPort.toInteger(), NodeType.BE, injectName)
@@ -158,7 +162,7 @@ suite('test_schema_change_with_compaction2',
'nonConcurrent') {
assertEquals(count[0][0], 20448);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" + err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction3/test_schema_change_with_compaction3.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction3/test_schema_change_with_compaction3.groovy
index b2aab9f2dc7..cf59823cb78 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction3/test_schema_change_with_compaction3.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction3/test_schema_change_with_compaction3.groovy
@@ -29,6 +29,7 @@ import org.apache.doris.regression.util.NodeType
suite('test_schema_change_with_compaction3', 'nonConcurrent') {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE COLUMN WHERE
IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
+ logger.info("jobStateResult: " + jobStateResult)
return jobStateResult[0][9]
}
@@ -57,6 +58,7 @@ suite('test_schema_change_with_compaction3', 'nonConcurrent')
{
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() - 1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel} failed.")
@@ -83,7 +85,7 @@ suite('test_schema_change_with_compaction3', 'nonConcurrent')
{
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
boolean running = true
do {
@@ -117,7 +119,7 @@ suite('test_schema_change_with_compaction3',
'nonConcurrent') {
// 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)
@@ -160,6 +162,8 @@ suite('test_schema_change_with_compaction3',
'nonConcurrent') {
running = compactionStatus.run_status
} while (running)
}
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
sql """ CANCEL ALTER TABLE COLUMN FROM date """
if (injectBe != null) {
@@ -183,7 +187,7 @@ suite('test_schema_change_with_compaction3',
'nonConcurrent') {
assertEquals(count[0][0], 23004);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" + err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction4/test_schema_change_with_compaction4.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction4/test_schema_change_with_compaction4.groovy
index 4b53dbdd998..a57e32bf922 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction4/test_schema_change_with_compaction4.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction4/test_schema_change_with_compaction4.groovy
@@ -29,6 +29,7 @@ import org.apache.doris.regression.util.NodeType
suite('test_schema_change_with_compaction4', 'nonConcurrent') {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE MATERIALIZED VIEW WHERE
IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
+ logger.info("jobStateResult: " + jobStateResult)
return jobStateResult[0][8]
}
@@ -57,6 +58,7 @@ suite('test_schema_change_with_compaction4', 'nonConcurrent')
{
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() - 1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel} failed.")
@@ -83,7 +85,7 @@ suite('test_schema_change_with_compaction4', 'nonConcurrent')
{
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
boolean running = true
do {
@@ -117,7 +119,7 @@ suite('test_schema_change_with_compaction4',
'nonConcurrent') {
// 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)
@@ -160,6 +162,8 @@ suite('test_schema_change_with_compaction4',
'nonConcurrent') {
running = compactionStatus.run_status
} while (running)
}
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
sql """ CANCEL ALTER TABLE MATERIALIZED VIEW FROM date """
if (injectBe != null) {
@@ -183,7 +187,7 @@ suite('test_schema_change_with_compaction4',
'nonConcurrent') {
assertEquals(count[0][0], 23004);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" + err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction5/test_schema_change_with_compaction5.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction5/test_schema_change_with_compaction5.groovy
index 094b8a53737..8af620ea647 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction5/test_schema_change_with_compaction5.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction5/test_schema_change_with_compaction5.groovy
@@ -60,6 +60,7 @@ suite('test_schema_change_with_compaction5', 'docker') {
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() -
1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel}
failed.")
@@ -86,7 +87,7 @@ suite('test_schema_change_with_compaction5', 'docker') {
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ",
err=" + err)
boolean running = true
do {
@@ -118,7 +119,7 @@ suite('test_schema_change_with_compaction5', '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)
@@ -164,6 +165,8 @@ suite('test_schema_change_with_compaction5', 'docker') {
cluster.restartFrontends()
sleep(30000)
context.reconnectFe()
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
GetDebugPoint().disableDebugPointForAllBEs(injectName)
@@ -186,7 +189,7 @@ suite('test_schema_change_with_compaction5', 'docker') {
assertEquals(count[0][0], 23004);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" +
err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
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 d2ac4f14cd9..4321a23f7b7 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
@@ -60,6 +60,7 @@ suite('test_schema_change_with_compaction6', 'docker') {
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() -
1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel}
failed.")
@@ -86,7 +87,7 @@ suite('test_schema_change_with_compaction6', 'docker') {
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ",
err=" + err)
boolean running = true
do {
@@ -167,6 +168,8 @@ suite('test_schema_change_with_compaction6', 'docker') {
} while (running)
}
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
GetDebugPoint().disableDebugPointForAllBEs(injectName)
@@ -189,7 +192,7 @@ suite('test_schema_change_with_compaction6', 'docker') {
assertEquals(count[0][0], 23004);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" +
err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction7/test_schema_change_with_compaction7.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction7/test_schema_change_with_compaction7.groovy
index 7291ea3a341..a43de53c472 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction7/test_schema_change_with_compaction7.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction7/test_schema_change_with_compaction7.groovy
@@ -29,6 +29,7 @@ import org.apache.doris.regression.util.NodeType
suite('test_schema_change_with_compaction7', 'nonConcurrent') {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE COLUMN WHERE
IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
+ logger.info("jobStateResult: " + jobStateResult)
return jobStateResult[0][9]
}
@@ -57,6 +58,7 @@ suite('test_schema_change_with_compaction7', 'nonConcurrent')
{
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() - 1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel} failed.")
@@ -83,7 +85,7 @@ suite('test_schema_change_with_compaction7', 'nonConcurrent')
{
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
boolean running = true
do {
@@ -116,7 +118,7 @@ suite('test_schema_change_with_compaction7',
'nonConcurrent') {
}
// 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)
@@ -159,6 +161,8 @@ suite('test_schema_change_with_compaction7',
'nonConcurrent') {
running = compactionStatus.run_status
} while (running)
}
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
DebugPoint.disableDebugPoint(injectBe.Host,
injectBe.HttpPort.toInteger(), NodeType.BE, injectName)
@@ -181,7 +185,7 @@ suite('test_schema_change_with_compaction7',
'nonConcurrent') {
assertEquals(count[0][0], 2556);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" + err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction8/test_schema_change_with_compaction8.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction8/test_schema_change_with_compaction8.groovy
index 1017e1d50f2..3002cb9c227 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction8/test_schema_change_with_compaction8.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction8/test_schema_change_with_compaction8.groovy
@@ -29,6 +29,7 @@ import org.apache.doris.regression.util.NodeType
suite('test_schema_change_with_compaction8', 'nonConcurrent') {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE COLUMN WHERE
IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
+ logger.info("jobStateResult: " + jobStateResult)
return jobStateResult[0][9]
}
@@ -57,6 +58,7 @@ suite('test_schema_change_with_compaction8', 'nonConcurrent')
{
// check load state
while (true) {
def stateResult = sql "show load where Label = '${loadLabel}'"
+ logger.info("stateResult: " + stateResult)
def loadState = stateResult[stateResult.size() - 1][2].toString()
if ("CANCELLED".equalsIgnoreCase(loadState)) {
throw new IllegalStateException("load ${loadLabel} failed.")
@@ -83,7 +85,7 @@ suite('test_schema_change_with_compaction8', 'nonConcurrent')
{
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
boolean running = true
do {
@@ -113,7 +115,7 @@ suite('test_schema_change_with_compaction8',
'nonConcurrent') {
// 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)
@@ -134,6 +136,8 @@ suite('test_schema_change_with_compaction8',
'nonConcurrent') {
logger.info("Run compaction: code=" + code + ", out=" + out + ", err="
+ err)
assertTrue(out.contains("invalid tablet state."))
+ } catch (Exception e) {
+ logger.error("Exception: " + e)
} finally {
if (injectBe != null) {
DebugPoint.disableDebugPoint(injectBe.Host,
injectBe.HttpPort.toInteger(), NodeType.BE, injectName)
@@ -158,7 +162,7 @@ suite('test_schema_change_with_compaction8',
'nonConcurrent') {
assertEquals(count[0][0], 2556);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" + err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
diff --git
a/regression-test/suites/cloud_p0/schema_change/compaction9/test_schema_change_with_compaction9.groovy
b/regression-test/suites/cloud_p0/schema_change/compaction9/test_schema_change_with_compaction9.groovy
index 316b10283b1..ad33e537d49 100644
---
a/regression-test/suites/cloud_p0/schema_change/compaction9/test_schema_change_with_compaction9.groovy
+++
b/regression-test/suites/cloud_p0/schema_change/compaction9/test_schema_change_with_compaction9.groovy
@@ -88,7 +88,7 @@ suite('test_schema_change_with_compaction9', 'docker') {
sql "select count(*) from date"
// cu compaction
logger.info("run compaction:" + originTabletId)
- (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_run_cumulative_compaction(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run compaction: code=" + code + ", out=" + out + ",
err=" + err)
boolean running = true
do {
@@ -120,7 +120,7 @@ suite('test_schema_change_with_compaction9', '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)
@@ -191,7 +191,7 @@ suite('test_schema_change_with_compaction9', 'docker') {
assertEquals(count[0][0], 2556);
// check rowsets
logger.info("run show:" + originTabletId)
- (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
+ def (code, out, err) = be_show_tablet_status(injectBe.Host,
injectBe.HttpPort, originTabletId)
logger.info("Run show: code=" + code + ", out=" + out + ", err=" +
err)
assertTrue(out.contains("[0-1]"))
assertTrue(out.contains("[2-7]"))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
