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

Use remote publication flag to decide which custom objects to upload #14338

Merged

Conversation

soosinha
Copy link
Member

@soosinha soosinha commented Jun 14, 2024

Description

This PR addresses the following:

  • Cluster state customs should only be uploaded when remote publication is enabled.
  • All metadata customs when remote publication is enabled while customs with context as GATEWAY should be uploaded otherwise
  • simplify the logic of computing the updated customs
  • Fix bug where metadata customs map was being used to remove cluster state customs to be deleted.
  • Close input stream while reading blob

Related Issues

NA

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.

Copy link
Contributor

❌ Gradle check result for 597057a: 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?

Copy link
Contributor

❌ Gradle check result for 0ab67e6: 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?

Copy link
Contributor

❌ Gradle check result for 8f3c702: 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?

Copy link
Contributor

❌ Gradle check result for 3a342c6: 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?

@soosinha
Copy link
Member Author

❌ Gradle check result for 3a342c6: 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?

Flaky test: #14296

Copy link
Contributor

❌ Gradle check result for 4a12c2e: 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?

Copy link
Contributor

✅ Gradle check result for 18eceb7: SUCCESS

Copy link

codecov bot commented Jun 15, 2024

Codecov Report

Attention: Patch coverage is 88.57143% with 8 lines in your changes missing coverage. Please review.

Project coverage is 71.77%. Comparing base (b15cb0c) to head (ac465ba).
Report is 433 commits behind head on main.

Files Patch % Lines
...arch/gateway/remote/RemoteClusterStateService.java 76.47% 1 Missing and 7 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #14338      +/-   ##
============================================
+ Coverage     71.42%   71.77%   +0.35%     
- Complexity    59978    62088    +2110     
============================================
  Files          4985     5118     +133     
  Lines        282275   291833    +9558     
  Branches      40946    42180    +1234     
============================================
+ Hits         201603   209460    +7857     
- Misses        63999    65057    +1058     
- Partials      16673    17316     +643     

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

Copy link
Contributor

✅ Gradle check result for e7bc511: SUCCESS

Signed-off-by: Sooraj Sinha <[email protected]>
@shwetathareja shwetathareja added backport 2.x Backport to 2.x branch backport 2.15 labels Jun 17, 2024
Copy link
Contributor

❕ Gradle check result for ac465ba: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@shwetathareja shwetathareja merged commit a3402d1 into opensearch-project:main Jun 17, 2024
37 of 38 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 17, 2024
…14338)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store

Signed-off-by: Sooraj Sinha <[email protected]>
(cherry picked from commit a3402d1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 17, 2024
…14338)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store

Signed-off-by: Sooraj Sinha <[email protected]>
(cherry picked from commit a3402d1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
shwetathareja pushed a commit that referenced this pull request Jun 17, 2024
…14338) (#14390)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store


(cherry picked from commit a3402d1)

Signed-off-by: Sooraj Sinha <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
shwetathareja pushed a commit that referenced this pull request Jun 17, 2024
…14338) (#14391)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store


(cherry picked from commit a3402d1)

Signed-off-by: Sooraj Sinha <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
harshavamsi pushed a commit to harshavamsi/OpenSearch that referenced this pull request Jul 12, 2024
…pensearch-project#14338)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store

Signed-off-by: Sooraj Sinha <[email protected]>
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
…pensearch-project#14338) (opensearch-project#14390)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store

(cherry picked from commit a3402d1)

Signed-off-by: Sooraj Sinha <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: kkewwei <[email protected]>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
…pensearch-project#14338)

* Simplify updated customs (ClusterState.Custom & Metadata.Custom) persistence logic to remote store

Signed-off-by: Sooraj Sinha <[email protected]>
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