Skip to content

[Backport 2.x] Restore snapshot changes for shallow snapshot V2 (#15462) #15613

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

[Backport 2.x] Restore snapshot changes for shallow snapshot V2 (#15462) #15613

wants to merge 4 commits into from

Conversation

@sachinpkale
Copy link
Member

@sachinpkale sachinpkale commented Sep 3, 2024 •
edited
Loading

Backport 7a9cb35 from #15462

Conflicts in: IndexShard and StoreRecovery classes.

Version is changed in RecoverySource and RestoreSnapshotRequest from CURRENT to 2.17.0

@github-actions
Copy link
Contributor

github-actions bot commented Sep 3, 2024

❌ Gradle check result for 0018907: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@sachinpkale sachinpkale force-pushed the backport-15462-to-2.x branch from 0018907 to e8eb169 Compare September 5, 2024 02:57
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for e8eb169: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for f65ae74: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for 6a0b9b5: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for 6a0b9b5: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@sachinpkale sachinpkale force-pushed the backport-15462-to-2.x branch from 6a0b9b5 to 00b0f2c Compare September 5, 2024 06:11
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for 6a0b9b5: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for 00b0f2c: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for 0027939: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

❌ Gradle check result for 0027939: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@sachinpkale sachinpkale changed the title Restore snapshot changes for shallow snapshot V2 (#15462) [Backport 2.x] Restore snapshot changes for shallow snapshot V2 (#15462) Sep 6, 2024
sachinpkale and others added 4 commits September 6, 2024 17:59
@sachinpkale @gbbafna
Restore snapshot changes for shallow snapshot V2 (opensearch-project#…
0c7dbb9 
…15462)

---------

Signed-off-by: Sachin Kale <[email protected]>
Co-authored-by: Sachin Kale <[email protected]>
Co-authored-by: Gaurav Bafna <[email protected]>
Change version from CURRENT to 2.17.0
d746866 
Signed-off-by: Sachin Kale <[email protected]>
Fix StoreRecovery
5acde27 
Signed-off-by: Sachin Kale <[email protected]>
Avoid backward incompatible change
1c55ad7 
Signed-off-by: Sachin Kale <[email protected]>
@sachinpkale sachinpkale force-pushed the backport-15462-to-2.x branch from 0027939 to 1c55ad7 Compare September 6, 2024 12:29
@sachinpkale sachinpkale mentioned this pull request Sep 6, 2024
Merged
3 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Sep 6, 2024

✅ Gradle check result for 1c55ad7: SUCCESS

@codecov
Copy link

codecov bot commented Sep 6, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 31.14754% with 126 lines in your changes missing coverage. Please review.

Project coverage is 71.63%. Comparing base (dcdc4d2) to head (1c55ad7).
Report is 13 commits behind head on 2.x.

Files with missing lines Patch % Lines
...java/org/opensearch/index/shard/StoreRecovery.java 0.00% 61 Missing ⚠️
...in/java/org/opensearch/index/shard/IndexShard.java 26.47% 20 Missing and 5 partials ⚠️
...ch/repositories/blobstore/BlobStoreRepository.java 22.22% 11 Missing and 3 partials ⚠️
...org/opensearch/cluster/routing/RecoverySource.java 52.38% 6 Missing and 4 partials ⚠️
...ster/snapshots/restore/RestoreSnapshotRequest.java 33.33% 3 Missing and 5 partials ⚠️
...rg/opensearch/index/translog/RemoteFsTranslog.java 25.00% 1 Missing and 2 partials ⚠️
.../org/opensearch/index/translog/TranslogConfig.java 50.00% 2 Missing ⚠️
...search/snapshots/InternalSnapshotsInfoService.java 84.61% 1 Missing and 1 partial ⚠️
...n/java/org/opensearch/repositories/Repository.java 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x   #15613      +/-   ##
============================================
+ Coverage     71.55%   71.63%   +0.08%     
- Complexity    64312    64414     +102     
============================================
  Files          5262     5263       +1     
  Lines        301279   301528     +249     
  Branches      43861    43903      +42     
============================================
+ Hits         215574   215999     +425     
+ Misses        67703    67447     -256     
- Partials      18002    18082      +80

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sachinpkale
Copy link
Member Author

sachinpkale commented Sep 6, 2024

Merged #15805 which has the same changes. Closing this PR.

@sachinpkale sachinpkale closed this Sep 6, 2024
This was referenced Sep 6, 2024
Open
Closed
Open
Open
Open
Open
Open
@prudhvigodithi prudhvigodithi mentioned this pull request Oct 16, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gbbafna gbbafna gbbafna approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@jed326 jed326 Awaiting requested review from jed326 jed326 is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

Assignees

No one assigned

Labels

skip-changelog

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sachinpkale @gbbafna