Skip to content

Commit 2ecd286

Browse files
committed
fix
1 parent bb4122a commit 2ecd286

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

fe/fe-core/src/main/java/org/apache/doris/load/GroupCommitManager.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,8 @@ private long selectBackendForCloudGroupCommitInternal(long tableId, String clust
293293
}
294294
List<String> backendsInfo = backends.stream()
295295
.map(be -> "{ beId=" + be.getId() + ", alive=" + be.isAlive() + ", active=" + be.isActive()
296-
+ ", decommission=" + be.isDecommissioned() + " }")
296+
+ ", decommissioned=" + be.isDecommissioned() + ", decommissioning=" + be.isDecommissioning()
297+
+ " }")
297298
.collect(Collectors.toList());
298299
throw new LoadException("No suitable backend for cloud cluster=" + cluster + ", backends = " + backendsInfo);
299300
}
@@ -348,7 +349,8 @@ private Long getCachedBackend(String cluster, long tableId) {
348349
return null;
349350
}
350351
Backend backend = Env.getCurrentSystemInfo().getBackend(backendId);
351-
if (backend != null && backend.isAlive() && !backend.isDecommissioned()) {
352+
if (backend != null && backend.isAlive() && !backend.isDecommissioned()
353+
&& (Config.isCloudMode() && !backend.isDecommissioning())) {
352354
return backend.getId();
353355
} else {
354356
tableToBeMap.remove(encode(cluster, tableId));
@@ -365,7 +367,8 @@ private Long getRandomBackend(String cluster, long tableId, List<Backend> backen
365367
OlapTable table = (OlapTable) Env.getCurrentEnv().getInternalCatalog().getTableByTableId(tableId);
366368
Collections.shuffle(backends);
367369
for (Backend backend : backends) {
368-
if (backend.isAlive() && !backend.isDecommissioned()) {
370+
if (backend.isAlive() && !backend.isDecommissioned() && (Config.isCloudMode()
371+
&& !backend.isDecommissioning())) {
369372
tableToBeMap.put(encode(cluster, tableId), backend.getId());
370373
tableToPressureMap.put(tableId,
371374
new SlidingWindowCounter(table.getGroupCommitIntervalMs() / 1000 + 1));

regression-test/suites/insert_p0/insert_group_commit_into.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ suite("insert_group_commit_into") {
476476
sql """ set insert_max_filter_ratio = 0.05; """
477477
test {
478478
sql """ insert into ${table} values('a', 'a'), ('10', 'a'), ('11', 'a'), ('12', 'a'); """
479-
exception """too many filtered rows"""
479+
exception """null value for not null column"""
480480
}
481481
getRowCount(2)
482482
} finally {

regression-test/suites/insert_p0/test_group_commit_interval_ms_property.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ suite("test_group_commit_interval_ms_property") {
5252
DISTRIBUTED BY HASH (k) BUCKETS 8
5353
PROPERTIES(
5454
"replication_num" = "1",
55-
"group_commit_interval_ms"="10000"
55+
"group_commit_interval_ms"="5000"
5656
);
5757
"""
5858

@@ -61,11 +61,11 @@ suite("test_group_commit_interval_ms_property") {
6161
sql """ set group_commit = async_mode; """
6262

6363
def res1 = sql """show create table ${test_table}"""
64-
assertTrue(res1.toString().contains("\"group_commit_interval_ms\" = \"10000\""))
64+
assertTrue(res1.toString().contains("\"group_commit_interval_ms\" = \"5000\""))
6565

6666
def msg1 = group_commit_insert """insert into ${test_table} values(1,1); """, 1
6767

68-
Thread.sleep(2000);
68+
Thread.sleep(100);
6969

7070
def msg2 = group_commit_insert """insert into ${test_table} values(2,2) """, 1
7171

@@ -78,7 +78,7 @@ suite("test_group_commit_interval_ms_property") {
7878

7979
def msg3 = group_commit_insert """insert into ${test_table} values(3,3); """, 1
8080

81-
Thread.sleep(8000);
81+
Thread.sleep(6000);
8282

8383
def msg4 = group_commit_insert """insert into ${test_table} values(4,4); """, 1
8484

0 commit comments

Comments
 (0)