-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
[Segment Replication] Wait for shard relocation before building node to shard allocation map #7876
Merged
dreamer-89
merged 2 commits into
opensearch-project:main
from
dreamer-89:flaky-segrep-bwc
Jun 6, 2023
Merged
[Segment Replication] Wait for shard relocation before building node to shard allocation map #7876
dreamer-89
merged 2 commits into
opensearch-project:main
from
dreamer-89:flaky-segrep-bwc
Jun 6, 2023
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
dreamer-89
requested review from
reta,
anasalkouz,
andrross,
Bukhtawar,
CEHENKLE,
dblock,
gbbafna,
setiah,
kartg,
kotwanikunal,
mch2,
nknize,
owaiskazi19,
Rishikesh1159,
ryanbogan,
saratvemulapalli,
shwetathareja,
tlfeng,
VachaShah and
dbwiddis
as code owners
June 2, 2023 01:30
Gradle Check (Jenkins) Run Completed with:
|
…to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com>
Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
force-pushed
the
flaky-segrep-bwc
branch
from
June 2, 2023 16:45
f7a8af8
to
431a6ae
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #7876 +/- ##
============================================
+ Coverage 70.75% 70.88% +0.12%
- Complexity 56244 56246 +2
============================================
Files 4689 4689
Lines 266340 266340
Branches 39098 39098
============================================
+ Hits 188460 188790 +330
+ Misses 61933 61520 -413
- Partials 15947 16030 +83 |
Poojita-Raj
approved these changes
Jun 5, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
mch2
approved these changes
Jun 6, 2023
qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/IndexingIT.java
Show resolved
Hide resolved
sandeshkr419
pushed a commit
to sandeshkr419/OpenSearch
that referenced
this pull request
Jun 8, 2023
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
added a commit
to dreamer-89/OpenSearch
that referenced
this pull request
Jun 23, 2023
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
added a commit
to dreamer-89/OpenSearch
that referenced
this pull request
Jun 24, 2023
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
added a commit
to dreamer-89/OpenSearch
that referenced
this pull request
Jun 28, 2023
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> Fix imports Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
added a commit
to dreamer-89/OpenSearch
that referenced
this pull request
Jul 11, 2023
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> Fix imports Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
added a commit
to dreamer-89/OpenSearch
that referenced
this pull request
Jul 12, 2023
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> Fix imports Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89
added a commit
that referenced
this pull request
Jul 13, 2023
…test (#7537) (#7626) * [Segment Replication] Added mixed and rolling upgrade bwc test (#7537) * [Segment Replication] Added mixed cluster bwc test Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unnecessary gradle task for segrep Signed-off-by: Suraj Singh <surajrider@gmail.com> * Spotless fix Signed-off-by: Suraj Singh <surajrider@gmail.com> * Spotless fix Signed-off-by: Suraj Singh <surajrider@gmail.com> * [Segment Replication] Rolling upgrade test Signed-off-by: Suraj Singh <surajrider@gmail.com> * PR feedback and cleanup Signed-off-by: Suraj Singh <surajrider@gmail.com> * Verify replica doc count only when it is assigned Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove wait for yellow cluster Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> (cherry picked from commit 0788feb) Add version check to skip test for 1.x bwc branches Signed-off-by: Suraj Singh <surajrider@gmail.com> * [Segment Replication] Wait for shard relocation before building node to shard allocation map (#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> Fix imports Signed-off-by: Suraj Singh <surajrider@gmail.com> * [Segment Replication] Update segrep bwc tests to verify replica checkpoints and skip tests for 1.x bwc versions (#8203) * [Segment Replication] Verify segment replication stats in bwc test Signed-off-by: Suraj Singh <surajrider@gmail.com> * Log cleanup Signed-off-by: Suraj Singh <surajrider@gmail.com> * Spotless check Signed-off-by: Suraj Singh <surajrider@gmail.com> * Add version check to skip test for 1.x bwc branches Signed-off-by: Suraj Singh <surajrider@gmail.com> * Add version check to skip test for 1.x bwc branches for mixed clusters Signed-off-by: Suraj Singh <surajrider@gmail.com> * Add version string in build to identify bwc version Signed-off-by: Suraj Singh <surajrider@gmail.com> * Use correct bwc version string Signed-off-by: Suraj Singh <surajrider@gmail.com> * Address review comments from #7626 Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> [Segment Replication] Use _cat/segments vs index stats + _search to verify doc count Signed-off-by: Suraj Singh <surajrider@gmail.com> Self review Signed-off-by: Suraj Singh <surajrider@gmail.com> remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> Handle 0 doc count segments Signed-off-by: Suraj Singh <surajrider@gmail.com> Add missing import statement Signed-off-by: Suraj Singh <surajrider@gmail.com> * [Segment Replication] Update bwc test to rely on segments for verification (#8267) * [Segment Replication] Use _cat/segments vs index stats + _search to verify doc count Signed-off-by: Suraj Singh <surajrider@gmail.com> Self review Signed-off-by: Suraj Singh <surajrider@gmail.com> remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> Handle 0 doc count segments Signed-off-by: Suraj Singh <surajrider@gmail.com> * Use 1 minute timeout for assertBusy validations and comments Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> Add missing import statement Signed-off-by: Suraj Singh <surajrider@gmail.com> * Fix missing import Signed-off-by: Suraj Singh <surajrider@gmail.com> * Logger change Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com>
shiv0408
pushed a commit
to Gaurav614/OpenSearch
that referenced
this pull request
Apr 25, 2024
…to shard allocation map (opensearch-project#7876) * [Segment Replication] Wait for shard relocation before building node to shard allocation map Signed-off-by: Suraj Singh <surajrider@gmail.com> * Remove unused imports Signed-off-by: Suraj Singh <surajrider@gmail.com> --------- Signed-off-by: Suraj Singh <surajrider@gmail.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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.
Description
This change fixes the flakyness of recently introduced segment replication bwc test. For doc count assertion, this test first makes API call to
index/_stats
to build map of shardId to nodeID ([index][1] -> abcdXXX
) (separate maps for primary and replica). Once map is built, a targeted search request is made which asserts same doc count for both primary and replica shards. The existing flakyness exists due to shard relocations which completes by the time search query hits the speicfic shard (now moved away to a different node). The fix here is to wait for relocations to complete before verifying doc count.Related Issues
Resolves #7679
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.