This is an automated email from the ASF dual-hosted git repository.
sollhui 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 4ba8b278046 [fix](fe) Persist routine load job before scheduling
(#67681)
4ba8b278046 is described below
commit 4ba8b278046c43fa8c278e3b5461b74826608060
Author: Refrain <[email protected]>
AuthorDate: Mon Sep 28 16:39:59 2026 +0800
[fix](fe) Persist routine load job before scheduling (#67681)
### What problem does this PR solve?
Issue Number: None
Related PR: None
Problem Summary:
Routine load creation published a mutable job to the scheduler before
serializing its create journal. The scheduler could change the job from
`NEED_SCHEDULE` to `RUNNING` before serialization, while runtime task
membership was not persisted. Replaying such a create record restored a
`RUNNING` job with no tasks. With stable source topology, the job could
remain stuck without consuming data.
This PR makes the create journal durable before publishing the job to
the scheduler. The scheduler cannot observe or mutate the job while its
initial `NEED_SCHEDULE` state is being serialized.
Before:
```text
publish job -> scheduler may change it to RUNNING -> serialize create
journal
```
After:
```text
serialize create journal in NEED_SCHEDULE -> publish job -> scheduler
creates tasks
```
The change does not modify `RoutineLoadJob.read()` or normalize states
during replay. There are no deployed historical Kinesis create records
that require compatibility recovery, and existing Kafka replay behavior
remains unchanged.
#### Separate cloud Kafka follow-up found during review
While evaluating a broader replay-time `RUNNING` to `NEED_SCHEDULE`
conversion, we found an independent ordering issue in cloud Kafka
automatic-partition recovery. `isKafkaPartitionsChanged()` can update
`currentKafkaPartitions` before `updateCloudProgress()` successfully
fetches the authoritative offset from Meta Service. If that fetch fails,
a later scheduler round can see stable topology and skip the Meta
Service retry. A recovery path that makes the job schedulable at that
point could create a task from stale FE metadata, repeat already
committed data, and regress stored routine-load progress.
This PR does not add that replay-time conversion and therefore does not
change or expose the cloud Kafka path. The cloud issue will be handled
separately by making authoritative Meta Service progress synchronization
a prerequisite for task creation and preserving the retry requirement
across scheduler rounds.
---
.../doris/load/routineload/RoutineLoadManager.java | 3 +-
.../routineload/RoutineLoadJobPersistenceTest.java | 146 +++++++++++++++++++++
2 files changed, 148 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
index 316ab79e423..e649a4edc7f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
@@ -243,8 +243,9 @@ public class RoutineLoadManager implements Writable {
+ " routine load jobs are running. exceed limit.");
}
- unprotectedAddJob(routineLoadJob);
+ // Persist the initial job before the scheduler can change its
state or create tasks.
Env.getCurrentEnv().getEditLog().logCreateRoutineLoadJob(routineLoadJob);
+ unprotectedAddJob(routineLoadJob);
} finally {
writeUnlock();
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobPersistenceTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobPersistenceTest.java
new file mode 100644
index 00000000000..801831bf74c
--- /dev/null
+++
b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobPersistenceTest.java
@@ -0,0 +1,146 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.load.routineload;
+
+import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.catalog.Env;
+import org.apache.doris.common.io.Text;
+import org.apache.doris.common.io.Writable;
+import org.apache.doris.common.jmockit.Deencapsulation;
+import org.apache.doris.load.routineload.RoutineLoadJob.JobState;
+import org.apache.doris.load.routineload.kafka.KafkaProgress;
+import org.apache.doris.load.routineload.kafka.KafkaRoutineLoadJob;
+import org.apache.doris.load.routineload.kinesis.KinesisProgress;
+import org.apache.doris.load.routineload.kinesis.KinesisRoutineLoadJob;
+import org.apache.doris.persist.EditLog;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.transaction.GlobalTransactionMgrIface;
+import org.apache.doris.transaction.TxnStateCallbackFactory;
+
+import com.google.common.collect.Lists;
+import com.google.gson.JsonParser;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.Map;
+
+public class RoutineLoadJobPersistenceTest {
+ private MockedStatic<Env> envMock;
+ private ConnectContext previousContext;
+ private EditLog editLog;
+ private RoutineLoadManager manager;
+ private TxnStateCallbackFactory callbackFactory;
+
+ @BeforeEach
+ public void setUp() {
+ previousContext = ConnectContext.get();
+ ConnectContext.remove();
+ envMock = Mockito.mockStatic(Env.class);
+ Env env = Mockito.mock(Env.class);
+ GlobalTransactionMgrIface transactionMgr =
Mockito.mock(GlobalTransactionMgrIface.class);
+ editLog = Mockito.mock(EditLog.class);
+ manager = new RoutineLoadManager();
+ callbackFactory = new TxnStateCallbackFactory();
+ envMock.when(Env::getCurrentEnv).thenReturn(env);
+
envMock.when(Env::getCurrentGlobalTransactionMgr).thenReturn(transactionMgr);
+ Mockito.when(env.getEditLog()).thenReturn(editLog);
+ Mockito.when(env.getRoutineLoadManager()).thenReturn(manager);
+
Mockito.when(env.getRoutineLoadTaskScheduler()).thenReturn(Mockito.mock(RoutineLoadTaskScheduler.class));
+
Mockito.when(transactionMgr.getCallbackFactory()).thenReturn(callbackFactory);
+ }
+
+ @AfterEach
+ public void tearDown() {
+ envMock.close();
+ ConnectContext.remove();
+ if (previousContext != null) {
+ previousContext.setThreadLocalInfo();
+ }
+ }
+
+ @ParameterizedTest
+ @EnumSource(value = LoadDataSourceType.class, names = {"KAFKA", "KINESIS"})
+ public void testCreateJournalBeforePublishingJob(LoadDataSourceType
dataSourceType) throws Exception {
+ RoutineLoadJob job = createJob(dataSourceType);
+ Mockito.doAnswer(invocation -> {
+ // Exercise scheduling at the old race window, before the create
record is serialized.
+ for (RoutineLoadJob visibleJob :
manager.getRoutineLoadJobByState(EnumSet.of(JobState.NEED_SCHEDULE))) {
+ setSourceProgress(visibleJob, dataSourceType);
+ visibleJob.divideRoutineLoadJob(1);
+ }
+ byte[] record = serialize(invocation.getArgument(0));
+ Assertions.assertEquals(JobState.NEED_SCHEDULE.name(),
serializedState(record));
+ Assertions.assertNull(manager.getJob(job.getId()));
+ Assertions.assertNull(callbackFactory.getCallback(job.getId()));
+ Assertions.assertEquals(0, job.getSizeOfRoutineLoadTaskInfoList());
+ return null;
+ }).when(editLog).logCreateRoutineLoadJob(job);
+
+ manager.addRoutineLoadJob(job, "db", "tbl");
+
+ Mockito.verify(editLog).logCreateRoutineLoadJob(job);
+ Assertions.assertSame(job, manager.getJob(job.getId()));
+ Assertions.assertSame(job, callbackFactory.getCallback(job.getId()));
+ setSourceProgress(job, dataSourceType);
+ job.divideRoutineLoadJob(1);
+ Assertions.assertEquals(JobState.RUNNING, job.getState());
+ Assertions.assertEquals(1, job.getSizeOfRoutineLoadTaskInfoList());
+ }
+
+ private RoutineLoadJob createJob(LoadDataSourceType dataSourceType) {
+ if (dataSourceType == LoadDataSourceType.KINESIS) {
+ return new KinesisRoutineLoadJob(1L, "job", 1L, 1L, "us-east-1",
"stream", UserIdentity.ADMIN);
+ }
+ return new KafkaRoutineLoadJob(1L, "job", 1L, 1L, "127.0.0.1:9092",
"topic", UserIdentity.ADMIN);
+ }
+
+ private void setSourceProgress(RoutineLoadJob job, LoadDataSourceType
dataSourceType) {
+ if (dataSourceType == LoadDataSourceType.KINESIS) {
+ job.progress = new KinesisProgress(Map.of("shard-0", "100"));
+ Deencapsulation.setField(job, "openKinesisShards",
Lists.newArrayList("shard-0"));
+ } else {
+ job.progress = new KafkaProgress(Map.of(0, 100L));
+ Deencapsulation.setField(job, "currentKafkaPartitions",
Lists.newArrayList(0));
+ }
+ }
+
+ private byte[] serialize(Writable value) throws IOException {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ try (DataOutputStream out = new DataOutputStream(bytes)) {
+ value.write(out);
+ }
+ return bytes.toByteArray();
+ }
+
+ private String serializedState(byte[] record) throws IOException {
+ try (DataInputStream in = new DataInputStream(new
ByteArrayInputStream(record))) {
+ return
JsonParser.parseString(Text.readString(in)).getAsJsonObject().get("st").getAsString();
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
