Skip to content
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] Backport PRs from main #6055

Merged
merged 2 commits into from
Jan 28, 2023

Conversation

dreamer-89
Copy link
Member

Backports #6015 and #5898 to 2.x

mch2 and others added 2 commits January 27, 2023 15:27
* Fix flaky SegmentReplicationITs.

This change fixes flakiness with segment replication ITs.
It does this by updating the wait condition used to ensure replicas are up to date
to wait until a searched docCount is reached instead of output of the Segments API that can change
if there are concurrent refreshes.
It also does this by updating the method used to assert segment stats to wait until the assertion holds true rather
than at a point in time.  This method is also updated to assert store metadata directly over API output.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Fix error message to print expected and actual doc counts.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* PR feedback.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* spotless.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
…nchronous (opensearch-project#5898)

* Update force segment replication sync to be synchronous

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Add logs and fix spotlessApply

Signed-off-by: Suraj Singh <surajrider@gmail.com>

    pick da8cb72ab4f Update unit test post rebase

* Update unit test post rebase

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Update integration tests

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Mute testPrimaryRelocationWithSegRepFailure

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Remove extra closing bracket after main merge

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* PR feedback

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Spotless fix

Signed-off-by: Suraj Singh <surajrider@gmail.com>

---------

Signed-off-by: Suraj Singh <surajrider@gmail.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #6055 (bc3dc40) into 2.x (125aaf4) will decrease coverage by 0.19%.
The diff coverage is 70.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x    #6055      +/-   ##
============================================
- Coverage     70.54%   70.35%   -0.19%     
+ Complexity    58994    58904      -90     
============================================
  Files          4769     4769              
  Lines        282621   282601      -20     
  Branches      41167    41165       -2     
============================================
- Hits         199385   198834     -551     
- Misses        66544    67123     +579     
+ Partials      16692    16644      -48     
Impacted Files Coverage Δ
...rg/opensearch/indices/recovery/RecoveryTarget.java 72.51% <ø> (ø)
...search/indices/recovery/RecoveryTargetHandler.java 100.00% <ø> (ø)
.../indices/recovery/RemoteRecoveryTargetHandler.java 92.30% <0.00%> (+2.75%) ⬆️
...ation/OpenSearchIndexLevelReplicationTestCase.java 89.67% <0.00%> (ø)
...s/replication/SegmentReplicationSourceHandler.java 91.89% <40.00%> (+0.86%) ⬆️
...in/java/org/opensearch/index/shard/IndexShard.java 69.91% <68.75%> (-0.58%) ⬇️
...search/indices/recovery/RecoverySourceHandler.java 76.60% <100.00%> (-1.55%) ⬇️
.../indices/replication/SegmentReplicationTarget.java 92.92% <100.00%> (+1.66%) ⬆️
...org/opensearch/index/shard/IndexShardTestCase.java 94.14% <100.00%> (+0.45%) ⬆️
...ensearch/indices/recovery/AsyncRecoveryTarget.java 100.00% <100.00%> (ø)
... and 481 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@mch2 mch2 merged commit 348852f into opensearch-project:2.x Jan 28, 2023
@dreamer-89 dreamer-89 deleted the backport/backport-5898-to-2.x branch March 2, 2023 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants