Skip to content
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

Jump to bottom

Pipe: Fixed the bug that events that do not trigger collection in processorSubtask may not be reported & the pipes that extract deletion in dataRegion extractor may be auto-restarted #12497

Merged
merged 1 commit into from
May 14, 2024
Merged

Pipe: Fixed the bug that events that do not trigger collection in processorSubtask may not be reported & the pipes that extract deletion in dataRegion extractor may be auto-restarted #12497

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
2 changes: 1 addition & 1 deletion ...ore/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ private void restartAllStuckPipesInternal() {
final String pipeName = pipeMeta.getStaticMeta().getPipeName();
final List<IoTDBDataRegionExtractor> extractors =
taskId2ExtractorMap.values().stream()
.filter(e -> e.getPipeName().equals(pipeName))
.filter(e -> e.getPipeName().equals(pipeName) && e.shouldExtractInsertion())
.collect(Collectors.toList());
if (extractors.isEmpty()
|| !extractors.get(0).isStreamMode()
Expand Down
6 changes: 6 additions & 0 deletions ...src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/IoTDBDataRegionExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
private DataRegionWatermarkInjector watermarkInjector;

private boolean hasNoExtractionNeed = true;
private boolean shouldExtractInsertion = false;

@Override
public void validate(final PipeParameterValidator validator) throws Exception {
Expand All @@ -105,6 +106,7 @@ public void validate(final PipeParameterValidator validator) throws Exception {
return;
}
hasNoExtractionNeed = false;
shouldExtractInsertion = insertionDeletionListeningOptionPair.getLeft();

if (insertionDeletionListeningOptionPair.getLeft().equals(true)
&& IoTDBDescriptor.getInstance()
Expand Down Expand Up @@ -439,6 +441,10 @@ public void close() throws Exception {

//////////////////////////// APIs provided for detecting stuck ////////////////////////////

public boolean shouldExtractInsertion() {
return shouldExtractInsertion;
}

public boolean isStreamMode() {
return realtimeExtractor instanceof PipeRealtimeDataRegionHybridExtractor
|| realtimeExtractor instanceof PipeRealtimeDataRegionLogExtractor;
Expand Down
24 changes: 12 additions & 12 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private void createAutoGauge(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
metricService.createAutoGauge(
Expand All @@ -90,7 +90,7 @@ private void createAutoGauge(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
metricService.createAutoGauge(
Expand All @@ -101,7 +101,7 @@ private void createAutoGauge(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
}
Expand All @@ -117,7 +117,7 @@ private void createRate(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime())));
tsFileRateMap.put(
Expand All @@ -128,7 +128,7 @@ private void createRate(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime())));
pipeHeartbeatRateMap.put(
Expand All @@ -139,7 +139,7 @@ private void createRate(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime())));
}
Expand Down Expand Up @@ -169,7 +169,7 @@ private void removeAutoGauge(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
metricService.remove(
Expand All @@ -178,7 +178,7 @@ private void removeAutoGauge(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
metricService.remove(
Expand All @@ -187,7 +187,7 @@ private void removeAutoGauge(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
}
Expand All @@ -201,7 +201,7 @@ private void removeRate(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
metricService.remove(
Expand All @@ -210,7 +210,7 @@ private void removeRate(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
metricService.remove(
Expand All @@ -219,7 +219,7 @@ private void removeRate(String taskID) {
Tag.NAME.toString(),
processor.getPipeName(),
Tag.REGION.toString(),
String.valueOf(processor.getDataRegionId()),
String.valueOf(processor.getRegionId()),
Tag.CREATION_TIME.toString(),
String.valueOf(processor.getCreationTime()));
tabletRateMap.remove(taskID);
Expand Down
20 changes: 13 additions & 7 deletions ...e/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeOutOfMemoryCriticalException;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.commons.pipe.execution.scheduler.PipeSubtaskScheduler;
import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager;
import org.apache.iotdb.commons.pipe.task.EventSupplier;
import org.apache.iotdb.commons.pipe.task.subtask.PipeReportableSubtask;
import org.apache.iotdb.db.pipe.agent.PipeAgent;
Expand Down Expand Up @@ -58,7 +59,7 @@ public class PipeProcessorSubtask extends PipeReportableSubtask {

// Record these variables to provide corresponding value to tag key of monitoring metrics
private final String pipeName;
private final int dataRegionId;
private final int regionId;

// This variable is used to distinguish between old and new subtasks before and after stuck
// restart.
Expand All @@ -68,14 +69,14 @@ public PipeProcessorSubtask(
final String taskID,
final long creationTime,
final String pipeName,
final int dataRegionId,
final int regionId,
final EventSupplier inputEventSupplier,
final PipeProcessor pipeProcessor,
final PipeEventCollector outputEventCollector) {
super(taskID, creationTime);
this.subtaskCreationTime = System.currentTimeMillis();
this.pipeName = pipeName;
this.dataRegionId = dataRegionId;
this.regionId = regionId;
this.inputEventSupplier = inputEventSupplier;
this.pipeProcessor = pipeProcessor;
this.outputEventCollector = outputEventCollector;
Expand Down Expand Up @@ -148,8 +149,13 @@ protected boolean executeOnce() throws Exception {
outputEventCollector);
}
}
decreaseReferenceCountAndReleaseLastEvent(
!isClosed.get() && outputEventCollector.hasNoCollectInvocationAfterReset());
final boolean shouldReport =
!isClosed.get() && outputEventCollector.hasNoCollectInvocationAfterReset();
if (shouldReport && event instanceof EnrichedEvent) {
PipeEventCommitManager.getInstance()
.enrichWithCommitterKeyAndCommitId((EnrichedEvent) event, creationTime, regionId);
}
decreaseReferenceCountAndReleaseLastEvent(shouldReport);
} catch (final PipeRuntimeOutOfMemoryCriticalException e) {
LOGGER.info(
"Temporarily out of memory in pipe event processing, will wait for the memory to release.",
Expand Down Expand Up @@ -237,8 +243,8 @@ public String getPipeName() {
return pipeName;
}

public int getDataRegionId() {
return dataRegionId;
public int getRegionId() {
return regionId;
}

public int getTabletInsertionEventCount() {
Expand Down
Loading