Skip to content

Subscription: fix the issue where subscription events cannot be auto recycled #13046

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

Closed
VGalaxies wants to merge 1 commit into from
Closed

Subscription: fix the issue where subscription events cannot be auto recycled #13046

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
20 changes: 13 additions & 7 deletions ...core/datanode/src/main/java/org/apache/iotdb/db/subscription/event/SubscriptionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class SubscriptionEvent {
private final SubscriptionCommitContext
commitContext; // all responses have the same commit context

// lastPolledConsumerId is not used as a criterion for determining pollability
private String lastPolledConsumerId;
private long lastPolledTimestamp;
private long committedTimestamp;
Expand Down Expand Up @@ -163,20 +164,18 @@ public boolean pollable() {
if (lastPolledTimestamp == INVALID_TIMESTAMP) {
return true;
}
if (Objects.nonNull(lastPolledConsumerId)) {
return false;
if (canRecycle()) {
nack();
return true;
}
// Recycle events that may not be able to be committed, i.e., those that have been polled but
// not committed within a certain period of time.
return System.currentTimeMillis() - lastPolledTimestamp
> SubscriptionConfig.getInstance().getSubscriptionRecycleUncommittedEventIntervalMs();
return false;
}

public void nack() {
// reset current response index
currentResponseIndex = 0;

lastPolledConsumerId = null;
// reset lastPolledTimestamp makes this event pollable
lastPolledTimestamp = INVALID_TIMESTAMP;
}

Expand All @@ -188,6 +187,13 @@ public String getLastPolledConsumerId() {
return lastPolledConsumerId;
}

private boolean canRecycle() {
// Recycle events that may not be able to be committed, i.e., those that have been polled but
// not committed within a certain period of time.
return System.currentTimeMillis() - lastPolledTimestamp
> SubscriptionConfig.getInstance().getSubscriptionRecycleUncommittedEventIntervalMs();
}

//////////////////////////// prefetch & fetch ////////////////////////////

/**
Expand Down