Fix remote segments sync retry regression introduced in PR #7119 #8632

ashking94 · 2023-07-11T16:54:57Z

Description

Fix segments upload retry regression introduced in PR #7119

Related Issues

Resolves #8631

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed per the DCO using --signoff
Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

ashking94 · 2023-07-11T16:57:43Z

@sachinpkale @gbbafna @raghuvanshraj @vikasvb90 can you review the fix?

…ect#7119 Signed-off-by: Ashish Singh <ssashish@amazon.com>

sachinpkale · 2023-07-11T17:16:53Z

Changes LGTM.

ashking94 · 2023-07-11T17:18:48Z

Running the tests in RemoteStoreRefreshListenerTests class for 100 iterations. 40 iterations have passed and it is ongoing.

github-actions · 2023-07-11T17:28:06Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.remotestore.multipart.RemoteStoreMultipartIT.testStaleCommitDeletionWithInvokeFlush
      1 org.opensearch.remotestore.RemoteStoreIT.testStaleCommitDeletionWithInvokeFlush

URL: https://build.ci.opensearch.org/job/gradle-check/19917/
CommitID: 6796c7a
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Signed-off-by: Sachin Kale <kalsac@amazon.com>

github-actions · 2023-07-11T17:47:50Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      3 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testPrimaryRelocationWithSegRepFailure
      1 org.opensearch.remotestore.multipart.RemoteStoreMultipartIT.testStaleCommitDeletionWithInvokeFlush
      1 org.opensearch.remotestore.RemoteStoreIT.testStaleCommitDeletionWithInvokeFlush
      1 org.opensearch.action.admin.cluster.node.tasks.ResourceAwareTasksTests.testBasicTaskResourceTracking

URL: https://build.ci.opensearch.org/job/gradle-check/19919/
CommitID: 489605b
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

codecov · 2023-07-11T17:50:01Z

Codecov Report

Merging #8632 (5a3b166) into main (0b42c2c) will decrease coverage by 0.04%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #8632      +/-   ##
============================================
- Coverage     70.96%   70.92%   -0.04%     
+ Complexity    57045    57018      -27     
============================================
  Files          4759     4759              
  Lines        269671   269668       -3     
  Branches      39452    39452              
============================================
- Hits         191374   191266     -108     
- Misses        62154    62271     +117     
+ Partials      16143    16131      -12

Impacted Files	Coverage Δ
...search/index/shard/RemoteStoreRefreshListener.java	`82.21% <100.00%> (+6.49%)`	⬆️
...earch/index/store/RemoteSegmentStoreDirectory.java	`86.34% <100.00%> (+2.15%)`	⬆️

... and 495 files with indirect coverage changes

Signed-off-by: Ashish Singh <ssashish@amazon.com>

server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java

github-actions · 2023-07-11T18:09:26Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/19929/
CommitID: bc7a3ee

Signed-off-by: Ashish Singh <ssashish@amazon.com>

github-actions · 2023-07-11T18:31:13Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPrimaryStopped_ReplicaPromoted
      1 org.opensearch.remotestore.SegmentReplicationRemoteStoreIT.testDropPrimaryDuringReplication
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testPrimaryRelocationWithSegRepFailure
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testPrimaryRelocation

URL: https://build.ci.opensearch.org/job/gradle-check/19935/
CommitID: fae3e72
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

github-actions · 2023-07-11T18:49:27Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testIndexCreateBlockIsRemovedWhenAnyNodesNotExceedHighWatermarkWithAutoReleaseEnabled

URL: https://build.ci.opensearch.org/job/gradle-check/19945/
CommitID: 5a3b166
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com> Signed-off-by: Ashish Singh <ssashish@amazon.com>

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>

* [Remote Store] Add multipart upload integration for translog and segment files (#7119) Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com> Signed-off-by: Ashish Singh <ssashish@amazon.com> * Fix remote segments sync retry regression introduced in PR #7119 (#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com> Signed-off-by: Ashish Singh <ssashish@amazon.com> * Empty-Commit Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com> Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Raghuvansh Raj <raghraaj@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com> Signed-off-by: sahil buddharaju <sahilbud@amazon.com>

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>

…-project#7119 (opensearch-project#8632) --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>

ashking94 added the skip-changelog label Jul 11, 2023

ashking94 marked this pull request as ready for review July 11, 2023 16:57

ashking94 mentioned this pull request Jul 11, 2023

[Mute] flaky RemoteStoreRefreshListenerTests #8626

Merged

6 tasks

Fix segments upload retry regression introduced in PR opensearch-proj…

489605b

…ect#7119 Signed-off-by: Ashish Singh <ssashish@amazon.com>

ashking94 force-pushed the 8631 branch from 6796c7a to 489605b Compare July 11, 2023 17:02

stephen-crawford approved these changes Jul 11, 2023

View reviewed changes

sachinpkale approved these changes Jul 11, 2023

View reviewed changes

Make sure IndexOutput of metadata file is always closed

bc7a3ee

Signed-off-by: Sachin Kale <kalsac@amazon.com>

Remove finally block and move method outside try/catch level

fae3e72

Signed-off-by: Ashish Singh <ssashish@amazon.com>

ashking94 changed the title ~~Fix segments upload retry regression introduced in PR #7119~~ Fix remote segments sync retry regression introduced in PR #7119 Jul 11, 2023

vikasvb90 reviewed Jul 11, 2023

View reviewed changes

server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java Outdated Show resolved Hide resolved

Incorporate PR comments

5a3b166

Signed-off-by: Ashish Singh <ssashish@amazon.com>

ashking94 mentioned this pull request Jul 11, 2023

[BUG] Gradle check on 2.x are failing due to RemoteStoreRefreshListenerTests tests #8638

Closed

sachinpkale merged commit 7dddb31 into opensearch-project:main Jul 12, 2023

sachinpkale mentioned this pull request Jul 12, 2023

Make sure IndexOutput of metadata file is always closed #8653

Merged

6 tasks

ashking94 mentioned this pull request Jul 12, 2023

[Backport 2.x] Manually backport #7119, #8626, #8632 #8654

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix remote segments sync retry regression introduced in PR #7119 #8632

Fix remote segments sync retry regression introduced in PR #7119 #8632

ashking94 commented Jul 11, 2023 •

edited

Loading

ashking94 commented Jul 11, 2023

sachinpkale commented Jul 11, 2023

ashking94 commented Jul 11, 2023

github-actions bot commented Jul 11, 2023

github-actions bot commented Jul 11, 2023

codecov bot commented Jul 11, 2023 •

edited

Loading

github-actions bot commented Jul 11, 2023

github-actions bot commented Jul 11, 2023

github-actions bot commented Jul 11, 2023

Fix remote segments sync retry regression introduced in PR #7119 #8632

Fix remote segments sync retry regression introduced in PR #7119 #8632

Conversation

ashking94 commented Jul 11, 2023 • edited Loading

Description

Related Issues

Check List

ashking94 commented Jul 11, 2023

sachinpkale commented Jul 11, 2023

ashking94 commented Jul 11, 2023

github-actions bot commented Jul 11, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jul 11, 2023

Gradle Check (Jenkins) Run Completed with:

codecov bot commented Jul 11, 2023 • edited Loading

Codecov Report

github-actions bot commented Jul 11, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jul 11, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jul 11, 2023

Gradle Check (Jenkins) Run Completed with:

ashking94 commented Jul 11, 2023 •

edited

Loading

codecov bot commented Jul 11, 2023 •

edited

Loading