Skip to content

branch-4.0: [fix](group commit) group commit skip decommissioning backend #58676 #58712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Dec 5, 2025
Merged

branch-4.0: [fix](group commit) group commit skip decommissioning backend #58676 #58712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/load/GroupCommitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ private long selectBackendForCloudGroupCommitInternal(long tableId, String clust
}
List<String> backendsInfo = backends.stream()
.map(be -> "{ beId=" + be.getId() + ", alive=" + be.isAlive() + ", active=" + be.isActive()
+ ", decommission=" + be.isDecommissioned() + " }")
+ ", decommissioned=" + be.isDecommissioned() + ", decommissioning=" + be.isDecommissioning()
+ " }")
.collect(Collectors.toList());
throw new LoadException("No suitable backend for cloud cluster=" + cluster + ", backends = " + backendsInfo);
}
Expand Down Expand Up @@ -348,7 +349,8 @@ private Long getCachedBackend(String cluster, long tableId) {
return null;
}
Backend backend = Env.getCurrentSystemInfo().getBackend(backendId);
if (backend != null && backend.isAlive() && !backend.isDecommissioned()) {
if (backend != null && backend.isAlive() && !backend.isDecommissioned()
&& (!Config.isCloudMode() || !backend.isDecommissioning())) {
return backend.getId();
} else {
tableToBeMap.remove(encode(cluster, tableId));
Expand All @@ -365,7 +367,8 @@ private Long getRandomBackend(String cluster, long tableId, List<Backend> backen
OlapTable table = (OlapTable) Env.getCurrentEnv().getInternalCatalog().getTableByTableId(tableId);
Collections.shuffle(backends);
for (Backend backend : backends) {
if (backend.isAlive() && !backend.isDecommissioned()) {
if (backend.isAlive() && !backend.isDecommissioned() && (!Config.isCloudMode()
|| !backend.isDecommissioning())) {
tableToBeMap.put(encode(cluster, tableId), backend.getId());
tableToPressureMap.put(tableId,
new SlidingWindowCounter(table.getGroupCommitIntervalMs() / 1000 + 1));
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/insert_p0/insert_group_commit_into.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ suite("insert_group_commit_into") {
sql """ set insert_max_filter_ratio = 0.05; """
test {
sql """ insert into ${table} values('a', 'a'), ('10', 'a'), ('11', 'a'), ('12', 'a'); """
exception """too many filtered rows"""
exception """null value for not null column"""
}
getRowCount(2)
} finally {
Expand Down
8 changes: 4 additions & 4 deletions regression-test/suites/insert_p0/test_group_commit_interval_ms_property.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ suite("test_group_commit_interval_ms_property") {
DISTRIBUTED BY HASH (k) BUCKETS 8
PROPERTIES(
"replication_num" = "1",
"group_commit_interval_ms"="10000"
"group_commit_interval_ms"="5000"
);
"""

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

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

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

Thread.sleep(2000);
Thread.sleep(100);

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

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

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

Thread.sleep(8000);
Thread.sleep(6000);

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

Expand Down
Loading