Skip to content

Commit 47b10db

Browse files
authored
[Fix](case) Fix some docker case (apache#54227) (apache#4263)
Fix 1. cloud_decommission increased it robustness 2. test_cloud_full_compaction_multi_segments, test_cloud_mow_retry_txn_interleave, test_cloud_concurrent_calc_dbm_task fix its not set fe debug point 3. fix CloudTablet.capture_rs_readers.return.e-230 debug point not work, due to apache#52440, pick from apache#54227
1 parent 1cc0e76 commit 47b10db

5 files changed

Lines changed: 18 additions & 11 deletions

File tree

‎be/src/vec/exec/scan/new_olap_scanner.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ Status NewOlapScanner::init() {
130130
auto* local_state = static_cast<pipeline::OlapScanLocalState*>(_local_state);
131131
auto& tablet = _tablet_reader_params.tablet;
132132
auto& tablet_schema = _tablet_reader_params.tablet_schema;
133+
DBUG_EXECUTE_IF("CloudTablet.capture_rs_readers.return.e-230", {
134+
LOG_WARNING("CloudTablet.capture_rs_readers.return e-230 init")
135+
.tag("tablet_id", tablet->tablet_id());
136+
return Status::Error<false>(-230, "injected error");
137+
});
138+
133139
for (auto& ctx : local_state->_common_expr_ctxs_push_down) {
134140
VExprContextSPtr context;
135141
RETURN_IF_ERROR(ctx->clone(_state, context));

‎regression-test/suites/cloud_p0/node_mgr/test_cloud_decommission.groovy‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ suite("cloud_decommission", 'p0, docker') {
2525

2626
def checkStatus = { ms, decommissionBeUniqueId, decommissionBe ->
2727
boolean found = false
28-
dockerAwaitUntil(100) {
28+
dockerAwaitUntil(600) {
2929
found = false
3030
def resp = get_cluster.call(decommissionBeUniqueId, ms)
3131
resp.each { cluster ->
@@ -43,7 +43,7 @@ suite("cloud_decommission", 'p0, docker') {
4343

4444
def dropAndCheckBe = { host, heartbeatPort ->
4545
sql """ ALTER SYSTEM DROPP BACKEND "${host}:${heartbeatPort}" """
46-
dockerAwaitUntil(100) {
46+
dockerAwaitUntil(600) {
4747
def result = sql_return_maparray """ SHOW BACKENDS """
4848
log.info("show backends result {}", result)
4949
def ret = result.find {it.Host == host && it.HeartbeatPort == heartbeatPort}
@@ -60,7 +60,7 @@ suite("cloud_decommission", 'p0, docker') {
6060

6161
def result = sql """ ADMIN SHOW REPLICA DISTRIBUTION FROM decommission_table """
6262
assertEquals(result.size(), beNum)
63-
dockerAwaitUntil(100) {
63+
dockerAwaitUntil(600) {
6464
result = sql_return_maparray """ ADMIN SHOW REPLICA DISTRIBUTION FROM decommission_table """
6565
if (beNum == 3) {
6666
result.every { Integer.valueOf((String) it.ReplicaNum) >= 15 && Integer.valueOf((String) it.ReplicaNum) <= 17 }
@@ -95,7 +95,7 @@ suite("cloud_decommission", 'p0, docker') {
9595
d_node.call(firstDecommissionBeUniqueId, firstDecommissionBe.Host, firstDecommissionBe.HeartbeatPort,
9696
firstDecommissionBeClusterName, firstDecommissionBeCloudClusterId, ms)
9797

98-
dockerAwaitUntil(100) {
98+
dockerAwaitUntil(600) {
9999
result = sql_return_maparray """ ADMIN SHOW REPLICA DISTRIBUTION FROM decommission_table """
100100
result.any { Integer.valueOf((String) it.ReplicaNum) == 0 }
101101
}
@@ -127,7 +127,7 @@ suite("cloud_decommission", 'p0, docker') {
127127
result = sql """ ADMIN SHOW REPLICA DISTRIBUTION FROM decommission_table """
128128
assertEquals(result.size(), beNum - 1)
129129

130-
dockerAwaitUntil(100) {
130+
dockerAwaitUntil(600) {
131131
result = sql_return_maparray """ ADMIN SHOW REPLICA DISTRIBUTION FROM decommission_table """
132132
log.info("show replica result {}", result)
133133
def ret = result.findAll { Integer.valueOf((String) it.ReplicaNum) == 0 }
@@ -164,7 +164,7 @@ suite("cloud_decommission", 'p0, docker') {
164164
log.info("in check, inner cost {}", cost)
165165
cost = System.currentTimeMillis() - begin
166166
log.info("in check, outter cost {}", cost)
167-
assertTrue(waitTime > atLeastCost)
167+
// assertTrue(waitTime > atLeastCost)
168168
// decommission 2 bes
169169
assertTrue(cost >= 2 * waitTime)
170170
cost
@@ -264,6 +264,9 @@ suite("cloud_decommission", 'p0, docker') {
264264
'cloud_tablet_rebalancer_interval_second=1',
265265
'cloud_cluster_check_interval_second=1'
266266
]
267+
clusterOptions[i].beConfigs += [
268+
'sys_log_verbose_modules=*',
269+
]
267270
clusterOptions[i].setFeNum(2)
268271
// cluster has 3 bes
269272
// cluster has 2 bes, after decommission 2 nodes, and drop 2 nodes, compute group name will be delete from fe

‎regression-test/suites/fault_injection_p0/cloud/test_cloud_concurrent_calc_dbm_task.groovy‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ suite("test_cloud_concurrent_calc_dbm_task", "multi_cluster,docker") {
2323
options.cloudMode = true
2424
options.setFeNum(1)
2525
options.setBeNum(1)
26+
options.enableDebugPoints()
2627
options.feConfigs += [
2728
'cloud_cluster_check_interval_second=1',
2829
'calculate_delete_bitmap_task_timeout_seconds=10',
2930
'mow_calculate_delete_bitmap_retry_times=10',
3031
'enable_workload_group=false',
3132
]
32-
options.beConfigs += [
33-
'enable_debug_points=true'
34-
]
3533

3634
docker(options) {
3735
try {

‎regression-test/suites/fault_injection_p0/cloud/test_cloud_full_compaction_multi_segments.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ suite("test_cloud_full_compaction_multi_segments","multi_cluster,docker") {
2727
options.cloudMode = true
2828
options.setFeNum(1)
2929
options.setBeNum(1)
30+
options.enableDebugPoints()
3031
options.feConfigs += [
3132
'cloud_cluster_check_interval_second=1',
3233
'calculate_delete_bitmap_task_timeout_seconds=10',
3334
'mow_calculate_delete_bitmap_retry_times=10',
3435
'enable_workload_group=false',
3536
]
3637
options.beConfigs += [
37-
'enable_debug_points=true',
3838
'doris_scanner_row_bytes=1' // to cause multi segments
3939
]
4040
docker(options) {

‎regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_retry_txn_interleave.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ suite("test_cloud_mow_retry_txn_interleave", "multi_cluster,docker") {
2323
options.cloudMode = true
2424
options.setFeNum(1)
2525
options.setBeNum(1)
26+
options.enableDebugPoints()
2627
options.feConfigs += [
2728
'cloud_cluster_check_interval_second=1',
2829
'calculate_delete_bitmap_task_timeout_seconds=20',
2930
'mow_calculate_delete_bitmap_retry_times=3'
3031
]
3132
options.beConfigs += [
32-
'enable_debug_points=true',
3333
'tablet_rowset_stale_sweep_time_sec=0',
3434
'vacuum_stale_rowsets_interval_s=10',
3535
]

0 commit comments

Comments
 (0)