Skip to content

Fix segment replication checkpoint not published after engine reset #20749

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
andrross wants to merge 1 commit into from
Closed

Fix segment replication checkpoint not published after engine reset #20749

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
12 changes: 12 additions & 0 deletions server/src/main/java/org/opensearch/index/shard/IndexShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,14 @@ public void updateShardState(
if (currentRouting.initializing() && currentRouting.isRelocationTarget() == false && newRouting.active()) {
// the cluster-manager started a recovering primary, activate primary mode.
replicationTracker.activatePrimaryMode(getLocalCheckpoint());
if (indexSettings.isSegRepLocalEnabled() && this.checkpointPublisher != null) {
// Force publish checkpoint so replicas catch up to segments that existed before
// the node restart. Without this, the internal refresh during engine construction
// may have already opened the latest reader, causing subsequent external refreshes
// to see no change and never trigger CheckpointRefreshListener.
updateReplicationCheckpoint();
checkpointPublisher.publish(this, getLatestReplicationCheckpoint());
}
postActivatePrimaryMode();
}
} else {
Expand Down Expand Up @@ -2291,6 +2299,10 @@ public void onCheckpointPublished(ReplicationCheckpoint checkpoint) {
*/
public void resetToWriteableEngine() throws IOException, InterruptedException, TimeoutException {
indexShardOperationPermits.blockOperations(30, TimeUnit.MINUTES, () -> { resetEngineToGlobalCheckpoint(); });
// Force update and publish checkpoint so replicas learn about segments that existed
// before the engine reset. See resetEngineToGlobalCheckpoint() in updateShardState()
// promotion path for the same pattern.
updateReplicationCheckpoint();
}

public MergedSegmentTransferTracker mergedSegmentTransferTracker() {
Expand Down
Loading