Skip to content

Fix checkpoint handling to prevent segment replication infinite loop #18636

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
merged 2 commits into from
Jul 3, 2025
Merged

Fix checkpoint handling to prevent segment replication infinite loop #18636

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
27e3218
Fix checkpoint handling to prevent segment replication infinite loop
ashking94 Jun 30, 2025
ed9e60a
Modify existing test to verify code change behaviour
ashking94 Jul 2, 2025
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
6 changes: 5 additions & 1 deletion server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

import java.io.IOException;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicLong;
Expand Down Expand Up @@ -347,7 +348,10 @@

// if we received a checkpoint during the copy event that is ahead of this
// try and process it.
processLatestReceivedCheckpoint(replicaShard, thread);
ReplicationCheckpoint latestReceivedCheckpoint = replicator.getPrimaryCheckpoint(replicaShard.shardId());
if (Objects.nonNull(latestReceivedCheckpoint) && latestReceivedCheckpoint.isAheadOf(receivedCheckpoint)) {
processLatestReceivedCheckpoint(replicaShard, thread);

Check warning on line 353 in server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java#L353 

Added line #L353 was not covered by tests
}
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions ...rc/test/java/org/opensearch/indices/replication/SegmentReplicationTargetServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ public void testStartReplicationListenerSuccess() throws InterruptedException {

latch.await(2, TimeUnit.SECONDS);
verify(spy, (atLeastOnce())).updateVisibleCheckpoint(eq(0L), eq(replicaShard));
verify(spy, times(1)).processLatestReceivedCheckpoint(any(), any());
}

public void testStartReplicationListenerFailure() throws InterruptedException {
Expand Down Expand Up @@ -851,4 +852,5 @@ public void testProcessCheckpointOnClusterStateUpdate() {
spy.clusterChanged(new ClusterChangedEvent("ignored", oldState, newState));
verify(spy, times(1)).processLatestReceivedCheckpoint(eq(replicaShard), any());
}

}
Loading