Fix FollowingEngineTests#testOptimizeMultipleVersions #75583
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In certain concurrent indexing scenarios where there are deletes executed and then a new indexing operation, the following engine considers those as updates breaking one of the assumed invariants. Closes elastic#72527
fcofdez
added
>test
|
Pinging @elastic/es-distributed (Team:Distributed) |
.../plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
Outdated
Show resolved
Hide resolved
.../plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java
Show resolved
Hide resolved
.../plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
Outdated
Show resolved
Hide resolved
|
Sorry, I didn't have the chance to look into this until now. I've added a synchronization point between the test threads that should make the issue easier to reproduce, before it took > 1000 runs to reproduce. |
henningandersen
approved these changes
Sep 1, 2021
| @@ -118,14 +118,27 @@ protected long generateSeqNoForOperationOnPrimary(final Operation operation) { | |||
| } | |||
|
|
|||
| @Override | |||
| protected void advanceMaxSeqNoOfUpdatesOrDeletesOnPrimary(long seqNo) { | |||
| protected void advanceMaxSeqNoOfDeleteOnPrimary(long seqNo) { | |||
There was a problem hiding this comment.
I think we should keep this in plural, i.e., advanceMaxSeqNoOfDeletesOnPrimary
| } | ||
|
|
||
| @Override | ||
| protected void advanceMaxSeqNoOfUpdateOnPrimary(long seqNo) { |
There was a problem hiding this comment.
Also plural here for consistency.
| // maxSeqNoOfUpdatesOrDeletes, since in this engine (effectively it is a replica) we don't check if the previous version | ||
| // was a delete and it's possible to consider it as an update, advancing the max sequence number over the leader | ||
| // maxSeqNoOfUpdatesOrDeletes. | ||
| // The goal of this marker it's just an optimization and it won't affect the correctness or durability of the indexed documents. |
There was a problem hiding this comment.
A wrong number could lead to incorrect behavior so I suggest to rephrase this to something like:
// We conservatively advance the seqno in this case, accepting a minor performance hit in this edge case.
|
@elasticmachine update branch |
fcofdez
added
the
auto-backport
fcofdez
added a commit
to fcofdez/elasticsearch
that referenced
this pull request
Sep 2, 2021
In certain concurrent indexing scenarios where there are deletes executed and then a new indexing operation, the following engine considers those as updates breaking one of the assumed invariants. Closes elastic#72527
💚 Backport successful
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In certain concurrent indexing scenarios where there are deletes
executed and then a new indexing operation, the following engine
considers those as updates breaking one of the assumed invariants.
Closes #72527