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

[Backport 2.x] Backport #15409 and #15624 to 2.x #15595

Merged

Conversation

ltaragi
Copy link
Contributor

@ltaragi ltaragi commented Sep 3, 2024


Signed-off-by: Lakshya Taragi lakshya.taragi@gmail.com
(cherry picked from commit 925f41b)

Description

This PR backports the following two changes to 2.x:

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

@ltaragi ltaragi changed the title [SnapshotV2] Snapshot Status API changes (#15409) [Backport 2.x] [SnapshotV2] Snapshot Status API changes (#15409) Sep 3, 2024
Copy link
Contributor

github-actions bot commented Sep 3, 2024

❌ Gradle check result for 91528f4: 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?

@ltaragi ltaragi force-pushed the backport/backport-15409-to-2.x branch from 91528f4 to 93a4b2c Compare September 3, 2024 06:42
Copy link
Contributor

github-actions bot commented Sep 3, 2024

❌ Gradle check result for 93a4b2c: 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?

@ltaragi ltaragi force-pushed the backport/backport-15409-to-2.x branch from 93a4b2c to 9708b49 Compare September 3, 2024 14:59
Copy link
Contributor

github-actions bot commented Sep 3, 2024

✅ Gradle check result for 9708b49: SUCCESS

Copy link

codecov bot commented Sep 3, 2024

Codecov Report

Attention: Patch coverage is 6.86275% with 95 lines in your changes missing coverage. Please review.

Project coverage is 71.64%. Comparing base (66d18a4) to head (278557a).
Report is 1 commits behind head on 2.x.

Files with missing lines Patch % Lines
...apshots/status/TransportSnapshotsStatusAction.java 0.00% 72 Missing ⚠️
...uster/snapshots/status/SnapshotsStatusRequest.java 20.00% 12 Missing ⚠️
...shots/TooManyShardsInSnapshotsStatusException.java 0.00% 7 Missing ⚠️
...napshots/status/SnapshotsStatusRequestBuilder.java 0.00% 4 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #15595      +/-   ##
============================================
+ Coverage     71.61%   71.64%   +0.02%     
+ Complexity    64042    64014      -28     
============================================
  Files          5248     5249       +1     
  Lines        299513   299596      +83     
  Branches      43609    43627      +18     
============================================
+ Hits         214495   214644     +149     
+ Misses        67058    66989      -69     
- Partials      17960    17963       +3     

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

@ltaragi ltaragi force-pushed the backport/backport-15409-to-2.x branch from 9708b49 to 608fcb6 Compare September 3, 2024 19:35
@ltaragi ltaragi changed the title [Backport 2.x] [SnapshotV2] Snapshot Status API changes (#15409) [Backport 2.x] Backport #15409 and #15624 to 2.x Sep 3, 2024
Copy link
Contributor

github-actions bot commented Sep 3, 2024

❌ Gradle check result for 608fcb6: TIMEOUT

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?

---------

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
(cherry picked from commit 925f41b)
…ject#15624)

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
(cherry picked from commit a60b668)
@ltaragi ltaragi force-pushed the backport/backport-15409-to-2.x branch from 608fcb6 to 278557a Compare September 4, 2024 03:56
Copy link
Contributor

github-actions bot commented Sep 4, 2024

✅ Gradle check result for 278557a: SUCCESS

@ashking94
Copy link
Member

@ltaragi can you share where all did you face conflicts while backporting?

@ashking94 ashking94 merged commit 01b38be into opensearch-project:2.x Sep 4, 2024
34 of 35 checks passed
ltaragi added a commit to ltaragi/OpenSearch that referenced this pull request Sep 4, 2024
…ct#15624 to 2.x (opensearch-project#15595)

* [SnapshotV2] Snapshot Status API changes (opensearch-project#15409)

---------

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
(cherry picked from commit 925f41b)

* Remove breaking changes from opensearch-project#15409 (opensearch-project#15624)

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
(cherry picked from commit a60b668)
(cherry picked from commit 01b38be)
ltaragi added a commit to ltaragi/OpenSearch that referenced this pull request Sep 4, 2024
…ct#15624 to 2.x (opensearch-project#15595)

* [SnapshotV2] Snapshot Status API changes (opensearch-project#15409)

---------

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
(cherry picked from commit 925f41b)

* Remove breaking changes from opensearch-project#15409 (opensearch-project#15624)

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
(cherry picked from commit a60b668)
(cherry picked from commit 01b38be)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants