Skip to content

[ISSUE #9689] Fix the issue that master transfer epoch was not updated in time #9690

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
RongtongJin merged 1 commit into from
Sep 22, 2025
Merged

[ISSUE #9689] Fix the issue that master transfer epoch was not updated in time #9690

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
3 changes: 2 additions & 1 deletion remoting/src/main/java/org/apache/rocketmq/remoting/protocol/EpochEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@

public class EpochEntry extends RemotingSerializable {

public static final long LAST_EPOCH_END_OFFSET = Long.MAX_VALUE;
private int epoch;
private long startOffset;
private long endOffset = Long.MAX_VALUE;
private long endOffset = LAST_EPOCH_END_OFFSET;

public EpochEntry(EpochEntry entry) {
this.epoch = entry.getEpoch();
Expand Down
14 changes: 14 additions & 0 deletions store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,20 @@ private void transferToSlave() throws Exception {
return;
}

// Check and update currentTransferEpochEndOffset
if (AutoSwitchHAConnection.this.currentTransferEpochEndOffset == -1) {
EpochEntry currentEpochEntry = AutoSwitchHAConnection.this.epochCache.getEntry(AutoSwitchHAConnection.this.currentTransferEpoch);
if (currentEpochEntry != null) {
if (currentEpochEntry.getEndOffset() != EpochEntry.LAST_EPOCH_END_OFFSET) {
LOGGER.info("Update currentTransferEpochEndOffset from -1 to {}", currentEpochEntry.getEndOffset());
AutoSwitchHAConnection.this.currentTransferEpochEndOffset = currentEpochEntry.getEndOffset();
}
} else {
// we should never reach here
LOGGER.warn("[BUG]Can't find currentTransferEpoch [{}] from epoch cache", currentTransferEpoch);
}
}

// We must ensure that the transmitted logs are within the same epoch
// If currentEpochEndOffset == -1, means that currentTransferEpoch = last epoch, so the endOffset = Long.max
final long currentEpochEndOffset = AutoSwitchHAConnection.this.currentTransferEpochEndOffset;
Expand Down
Loading