Skip to content

[Pipe] Fix conversion task ID collision after leader switch #18494

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
Caideyipi merged 1 commit into from
Aug 19, 2026
+35 −6
Merged

[Pipe] Fix conversion task ID collision after leader switch #18494

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
11 changes: 5 additions & 6 deletions ...apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,11 @@ public static String generateConversionTaskId(
} catch (final UnsupportedOperationException ignored) {
appendStablePart(eventIdentity, UNSUPPORTED_REPLICATE_INDEX);
}
if (event.getCommitterKey() == null) {
try {
appendStablePart(eventIdentity, String.valueOf(event.getProgressIndex()));
} catch (final UnsupportedOperationException ignored) {
appendStablePart(eventIdentity, UNSUPPORTED_PROGRESS_INDEX);
}
// Commit ids are local to a DataNode and may collide after a leader change.
try {
appendStablePart(eventIdentity, String.valueOf(event.getProgressIndex()));
} catch (final UnsupportedOperationException ignored) {
appendStablePart(eventIdentity, UNSUPPORTED_PROGRESS_INDEX);
}
eventIdentities.add(eventIdentity.toString());
}
Expand Down
30 changes: 30 additions & 0 deletions ...e/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

package org.apache.iotdb.db.pipe.sink;

import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.pipe.agent.task.progress.CommitterKey;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.commons.pipe.sink.payload.thrift.common.PipeTransferHandshakeConstant;
import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
Expand Down Expand Up @@ -71,6 +74,7 @@
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;

import java.io.DataOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -1215,6 +1219,32 @@ public void testPipeTransferTsFileSealConversionTaskInfoIsStable() throws IOExce
Assert.assertFalse(deserialized.shouldAsyncLoadOnTypeMismatch());
}

@Test
public void testPipeTransferTsFileSealConversionTaskIdDistinguishesProgressIndexes() {
final CommitterKey committerKey = new CommitterKey("pipe", 1L, 1, 0);
final EnrichedEvent firstEvent = Mockito.mock(EnrichedEvent.class);
Mockito.when(firstEvent.getCommitterKey()).thenReturn(committerKey);
Mockito.when(firstEvent.getCommitIds()).thenReturn(Collections.singletonList(1L));
Mockito.when(firstEvent.getProgressIndex()).thenReturn(new IoTProgressIndex(1, 1L));

final EnrichedEvent secondEvent = Mockito.mock(EnrichedEvent.class);
Mockito.when(secondEvent.getCommitterKey()).thenReturn(committerKey);
Mockito.when(secondEvent.getCommitIds()).thenReturn(Collections.singletonList(1L));
Mockito.when(secondEvent.getProgressIndex()).thenReturn(new IoTProgressIndex(1, 100L));

final String firstTaskId =
PipeTransferTsFileSealWithModReq.generateConversionTaskId(
"sink-task", Collections.singletonList(firstEvent), "root.db", 0);
Assert.assertEquals(
firstTaskId,
PipeTransferTsFileSealWithModReq.generateConversionTaskId(
"sink-task", Collections.singletonList(firstEvent), "root.db", 0));
Assert.assertNotEquals(
firstTaskId,
PipeTransferTsFileSealWithModReq.generateConversionTaskId(
"sink-task", Collections.singletonList(secondEvent), "root.db", 0));
}

@Test
public void testPipeTransferTsFileSealWithModReqFromLegacyV13BodyWithoutDatabaseName()
throws IOException {
Expand Down
Loading