Skip to content

Pipe: fix calculations of PipeDataNodeRemainingEventAndTimeOperator #13876

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
SteveYurongSu merged 2 commits into from
Oct 23, 2024
Merged

Pipe: fix calculations of PipeDataNodeRemainingEventAndTimeOperator #13876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eb9c67
try fix
VGalaxies Oct 22, 2024
7a69e0c
rename insertionEventCount -> tabletEventCount
VGalaxies Oct 22, 2024
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
4 changes: 2 additions & 2 deletions ...java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public boolean internallyIncreaseResourceReferenceCount(final String holderMessa
PipeDataNodeResourceManager.wal().pin(walEntryHandler);
if (Objects.nonNull(pipeName)) {
PipeDataNodeRemainingEventAndTimeMetrics.getInstance()
.increaseInsertionEventCount(pipeName + "_" + creationTime);
.increaseTabletEventCount(pipeName + "_" + creationTime);
}
return true;
} catch (final Exception e) {
Expand Down Expand Up @@ -196,7 +196,7 @@ public boolean internallyDecreaseResourceReferenceCount(final String holderMessa
} finally {
if (Objects.nonNull(pipeName)) {
PipeDataNodeRemainingEventAndTimeMetrics.getInstance()
.decreaseInsertionEventCount(pipeName + "_" + creationTime);
.decreaseTabletEventCount(pipeName + "_" + creationTime);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public boolean internallyIncreaseResourceReferenceCount(final String holderMessa
PipeMemoryWeightUtil.calculateTabletSizeInBytes(tablet));
if (Objects.nonNull(pipeName)) {
PipeDataNodeRemainingEventAndTimeMetrics.getInstance()
.increaseInsertionEventCount(pipeName + "_" + creationTime);
.increaseTabletEventCount(pipeName + "_" + creationTime);
}
return true;
}
Expand All @@ -180,7 +180,7 @@ public boolean internallyIncreaseResourceReferenceCount(final String holderMessa
public boolean internallyDecreaseResourceReferenceCount(final String holderMessage) {
if (Objects.nonNull(pipeName)) {
PipeDataNodeRemainingEventAndTimeMetrics.getInstance()
.decreaseInsertionEventCount(pipeName + "_" + creationTime);
.decreaseTabletEventCount(pipeName + "_" + creationTime);
}
allocatedMemoryBlock.close();

Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,16 @@ public void register(final IoTDBSchemaRegionExtractor extractor) {
}
}

public void increaseInsertionEventCount(final String pipeID) {
public void increaseTabletEventCount(final String pipeID) {
remainingEventAndTimeOperatorMap
.computeIfAbsent(pipeID, k -> new PipeDataNodeRemainingEventAndTimeOperator())
.increaseInsertionEventCount();
.increaseTabletEventCount();
}

public void decreaseInsertionEventCount(final String pipeID) {
public void decreaseTabletEventCount(final String pipeID) {
remainingEventAndTimeOperatorMap
.computeIfAbsent(pipeID, k -> new PipeDataNodeRemainingEventAndTimeOperator())
.decreaseInsertionEventCount();
.decreaseTabletEventCount();
}

public void increaseTsFileEventCount(final String pipeID) {
Expand Down
13 changes: 7 additions & 6 deletions .../main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOperator {
private final Set<IoTDBSchemaRegionExtractor> schemaRegionExtractors =
Collections.newSetFromMap(new ConcurrentHashMap<>());

private final AtomicInteger insertionEventCount = new AtomicInteger(0);
private final AtomicInteger tabletEventCount = new AtomicInteger(0);
private final AtomicInteger tsfileEventCount = new AtomicInteger(0);
private final AtomicInteger heartbeatEventCount = new AtomicInteger(0);

Expand All @@ -58,12 +58,12 @@ class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOperator {

//////////////////////////// Remaining event & time calculation ////////////////////////////

void increaseInsertionEventCount() {
tsfileEventCount.incrementAndGet();
void increaseTabletEventCount() {
tabletEventCount.incrementAndGet();
}

void decreaseInsertionEventCount() {
tsfileEventCount.decrementAndGet();
void decreaseTabletEventCount() {
tabletEventCount.decrementAndGet();
}

void increaseTsFileEventCount() {
Expand All @@ -84,6 +84,7 @@ void decreaseHeartbeatEventCount() {

long getRemainingEvents() {
return tsfileEventCount.get()
+ tabletEventCount.get()
+ heartbeatEventCount.get()
+ schemaRegionExtractors.stream()
.map(IoTDBSchemaRegionExtractor::getUnTransferredEventCount)
Expand All @@ -105,7 +106,7 @@ long getRemainingEvents() {
final double invocationValue = collectInvocationHistogram.getMean();
// Do not take heartbeat event into account
final double totalDataRegionWriteEventCount =
tsfileEventCount.get() * Math.max(invocationValue, 1) + insertionEventCount.get();
tsfileEventCount.get() * Math.max(invocationValue, 1) + tabletEventCount.get();

dataRegionCommitMeter.updateAndGet(
meter -> {
Expand Down