database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[branch-2.1] Picks "[opt](merge-on-write) Reduce the version not continuous logs for merge-on-write table #40946" (#40996)

Browse Source 
picks https://github.com/apache/doris/pull/40946
This commit is contained in:
bobhan1
2024-09-19 23:58:05 +08:00
committed by GitHub
parent f81d087bab
commit 49dec9f39d
5 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java
View File

@ -29,6 +29,7 @@ import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.Tablet;
import org.apache.doris.catalog.TabletInvertedIndex;
import org.apache.doris.catalog.TabletMeta;
import org.apache.doris.common.Config;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.load.DeleteJob;
import org.apache.doris.load.loadv2.SparkLoadJob;
@ -86,11 +87,13 @@ public class MasterImpl {
// check task status
// retry task by report process
TStatus taskStatus = request.getTaskStatus();
TTaskType taskType = request.getTaskType();
long signature = request.getSignature();
if (LOG.isDebugEnabled()) {
LOG.debug("get task report: {}", request);
}
if (taskStatus.getStatusCode() != TStatusCode.OK) {
if (taskStatus.getStatusCode() != TStatusCode.OK && taskType != TTaskType.PUBLISH_VERSION) {
LOG.warn("finish task reports bad. request: {}", request);
}
@ -109,8 +112,6 @@ public class MasterImpl {
}
long backendId = backend.getId();
TTaskType taskType = request.getTaskType();
long signature = request.getSignature();
AgentTask task = AgentTaskQueue.getTask(backendId, taskType, signature);
if (task == null) {
@ -128,6 +129,13 @@ public class MasterImpl {
} else {
if (taskStatus.getStatusCode() != TStatusCode.OK) {
task.failed();
if (taskType == TTaskType.PUBLISH_VERSION) {
boolean needLog = (Config.publish_version_task_failed_log_threshold < 0
|| task.getFailedTimes() <= Config.publish_version_task_failed_log_threshold);
if (needLog) {
LOG.warn("finish task reports bad. request: {}", request);
}
}
String errMsg = "task type: " + taskType + ", status_code: " + taskStatus.getStatusCode().toString()
+ (taskStatus.isSetErrorMsgs() ? (", status_message: " + taskStatus.getErrorMsgs()) : "")
+ ", backendId: " + backend + ", signature: " + signature;