Skip to content

Fix flaky test RemoteIndexPrimaryRelocationIT #11614

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
sachinpkale wants to merge 4 commits into from
Closed

Fix flaky test RemoteIndexPrimaryRelocationIT #11614

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
154b963
Fix flaky test RemoteIndexPrimaryRelocationIT
Dec 12, 2023
6664012
Keep the old assertion same for non remote backed indexes
Dec 14, 2023
caf7498
Fix spotless errors
Dec 14, 2023
9362e4f
Address PR comments
Jan 18, 2024
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: 8 additions & 1 deletion 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 @@ -3433,7 +3433,14 @@ public void activateWithPrimaryContext(final ReplicationTracker.PrimaryContext p
+ "] does not contain relocation target ["
+ routingEntry()
+ "]";
assert getLocalCheckpoint() == primaryContext.getCheckpointStates().get(routingEntry().allocationId().getId()).getLocalCheckpoint()
String allocationId = routingEntry().allocationId().getId();
if (isRemoteStoreEnabled()) {
Copy link
Copy Markdown
Member

@peternied peternied Dec 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets add in some tests cases to confirm this behavior

Copy link
Copy Markdown
Member Author

@sachinpkale sachinpkale Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There already a test exists: org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing but it is flaky without this change

Copy link
Copy Markdown
Member

@peternied peternied Jan 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the annotation below this codepath isn't hit, is the coverage tool incorrect?

Copy link
Copy Markdown
Member Author

@sachinpkale sachinpkale Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is: coverage tool does not consider code covered by integ tests

OpenSearch/gradle/code-coverage.gradle

Lines 37 to 44 in 4323af1

if (System.getProperty("tests.coverage")) {
reporting {
reports {
testCodeCoverageReport(JacocoCoverageReport) {
testType = TestSuiteType.UNIT_TEST
}
}
}

Copy link
Copy Markdown
Member Author

@sachinpkale sachinpkale Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me add unit test around this change.

Copy link
Copy Markdown
Member

@peternied peternied Feb 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @sachinpkale !

// For remote backed indexes, old primary may not have updated value of local checkpoint of new primary.
// But the new primary is always updated with data in remote sore and is at par with old primary.
// So, we can use a stricter check where local checkpoint of new primary is checked against that of old primary.
allocationId = primaryContext.getRoutingTable().primaryShard().allocationId().getId();
}
assert getLocalCheckpoint() == primaryContext.getCheckpointStates().get(allocationId).getLocalCheckpoint()
|| indexSettings().getTranslogDurability() == Durability.ASYNC : "local checkpoint ["
+ getLocalCheckpoint()
+ "] does not match checkpoint from primary context ["
Expand Down