Skip to content

[server] Fix Tabletserver may run into deadlock status issue #768

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
wuchong merged 1 commit into from
Apr 21, 2025
Merged

[server] Fix Tabletserver may run into deadlock status issue #768

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
9 changes: 1 addition & 8 deletions fluss-server/src/main/java/com/alibaba/fluss/server/replica/Replica.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,14 +827,7 @@ public LogAppendInfo appendRecordsToLeader(MemoryLogRecords memoryLogRecords, in
throw new LogStorageException(
"Error while appending records to " + tableBucket, e);
}

// we may need to increment high watermark if isr could be down to 1 or the
// replica count is 1.
boolean hwIncreased = maybeIncrementLeaderHW(logTablet, clock.milliseconds());

if (hwIncreased) {
tryCompleteDelayedOperations();
}
maybeIncrementLeaderHW(logTablet, clock.milliseconds());

return appendInfo;
});
Expand Down
3 changes: 3 additions & 0 deletions fluss-server/src/test/java/com/alibaba/fluss/server/replica/delay/DelayedFetchLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ void testCompleteDelayedFetchLog() throws Exception {
future::complete);
assertThat(future.get()).containsOnly(new ProduceLogResultForBucket(tb, 0, 10L));

// check and complete manually
numComplete = delayedFetchLogManager.checkAndComplete(delayedTableBucketKey);
assertThat(numComplete).isEqualTo(1);
assertThat(delayedFetchLogManager.numDelayed()).isEqualTo(0);
assertThat(delayedFetchLogManager.watched()).isEqualTo(0);

Expand Down