You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by li...@apache.org on 2024/07/16 01:51:50 UTC
(doris) branch master updated: Revert "[fix](routine-load) fix auto resume invalid when FE leader change (#37071)" (#37804)
This is an automated email from the ASF dual-hosted git repository.
liaoxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new cfae9604a2e Revert "[fix](routine-load) fix auto resume invalid when FE leader change (#37071)" (#37804)
cfae9604a2e is described below
commit cfae9604a2e9b20eb7e7e2781a45141a087bd680
Author: hui lai <13...@qq.com>
AuthorDate: Tue Jul 16 09:51:42 2024 +0800
Revert "[fix](routine-load) fix auto resume invalid when FE leader change (#37071)" (#37804)
revert (#37071)
It will only call the `write` method to write the edit log when creating
the routine load job, but will not use this method when change job state
to pause, but use the logic:
```
Env.getCurrentEnv().getEditLog().logOpRoutineLoadJob(new RoutineLoadOperation(id, jobState));
```
Therefore, using the logic:
```
@SerializedName("pr")
protected ErrorReason pauseReason;
```
only persist pauseReason when create job, rather than pause job, which
means `pauseReason` will not be persist when it is assigned due to
pause, causing auto resume still invalid if FE leader change when job
pause.
---
.../main/java/org/apache/doris/load/routineload/RoutineLoadJob.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
index 51f31837780..d870922e2d7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
@@ -242,16 +242,11 @@ public abstract class RoutineLoadJob
@SerializedName("pg")
protected RoutineLoadProgress progress;
- @SerializedName("lrt")
protected long latestResumeTimestamp; // the latest resume time
- @SerializedName("art")
protected long autoResumeCount;
// some other msg which need to show to user;
- @SerializedName("om")
protected String otherMsg = "";
- @SerializedName("pr")
protected ErrorReason pauseReason;
- @SerializedName("cr")
protected ErrorReason cancelReason;
@SerializedName("cts")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org