This is an automated email from the ASF dual-hosted git repository. liaoxin pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push: new 84726582ab1 [fix](load) fix broker load progress due to retry (#42959) (#44123) 84726582ab1 is described below commit 84726582ab17c40ae11eb4d6cc324230f6495f1a Author: Kaijie Chen <c...@apache.org> AuthorDate: Mon Nov 18 14:08:10 2024 +0800 [fix](load) fix broker load progress due to retry (#42959) (#44123) backport #42959 --- .../src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java index 14cd742be45..b2d6dc44697 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java @@ -20,6 +20,7 @@ package org.apache.doris.load.loadv2; import org.apache.doris.analysis.BrokerDesc; import org.apache.doris.analysis.UserIdentity; import org.apache.doris.catalog.Database; +import org.apache.doris.catalog.Env; import org.apache.doris.catalog.OlapTable; import org.apache.doris.common.Config; import org.apache.doris.common.LoadException; @@ -215,6 +216,8 @@ public class LoadLoadingTask extends LoadTask { UUID uuid = UUID.randomUUID(); this.loadId = new TUniqueId(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits()); planner.updateLoadId(this.loadId); + // reset progress on each retry, otherwise the finished/total num will be incorrect + Env.getCurrentProgressManager().registerProgressSimple(String.valueOf(callback.getCallbackId())); } void settWorkloadGroups(List<TPipelineWorkloadGroup> tWorkloadGroups) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org