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.

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

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

Merged
merged 7 commits into from
Jun 17, 2024
Merged

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

merged 7 commits into from
Jun 17, 2024

Conversation

soosinha
Copy link
Member

@soosinha soosinha commented Jun 14, 2024 •
edited
Loading

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.

@github-actions GitHub Actions
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?

@github-actions GitHub Actions
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?

@github-actions GitHub Actions
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?

@github-actions GitHub Actions
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

@github-actions GitHub Actions
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?

@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for 18eceb7: SUCCESS

@codecov Codecov
Copy link

codecov bot commented Jun 15, 2024 •
edited
Loading

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.

@soosinha
Simplify updated customs logic
b2aab1b 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha
Fix unit tests
7da9fdf 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha
Fix getUpdatedCustoms test
48205b6 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha
use try with resources
f2ae040 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha
Add more assertions
d61fe23 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha
Remove first ephemeral upload check from incremental update
e7bc511 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for e7bc511: SUCCESS

@soosinha
Modify variable name
ac465ba 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@shwetathareja shwetathareja added backport 2.x Backport to 2.x branch backport 2.15 labels Jun 17, 2024
@github-actions GitHub Actions
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
@github-actions
Use remote publication flag to decide which custom objects to upload (#…
4b3721e 
…14338)

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

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
(cherry picked from commit a3402d1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jun 17, 2024
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 17, 2024
@github-actions
Use remote publication flag to decide which custom objects to upload (#…
a3e4d42 
…14338)

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

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
(cherry picked from commit a3402d1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jun 17, 2024
Merged
shwetathareja pushed a commit that referenced this pull request Jun 17, 2024
@opensearch-trigger-bot @github-actions
Use remote publication flag to decide which custom objects to upload (#…
9614561 
…14338) (#14390)

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


(cherry picked from commit a3402d1)

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
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>
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Jun 14, 2024
Open
shwetathareja pushed a commit that referenced this pull request Jun 17, 2024
@opensearch-trigger-bot @github-actions
Use remote publication flag to decide which custom objects to upload (#…
b500747 
…14338) (#14391)

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


(cherry picked from commit a3402d1)

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
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>
@soosinha soosinha mentioned this pull request Jun 18, 2024
Open
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Jun 20, 2024
Open
harshavamsi pushed a commit to harshavamsi/OpenSearch that referenced this pull request Jul 12, 2024
@soosinha @harshavamsi
Use remote publication flag to decide which custom objects to upload (o…
7057ec7 
…pensearch-project#14338)

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

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
@opensearch-trigger-bot @github-actions @kkewwei
Use remote publication flag to decide which custom objects to upload (o…
99d7f0f 
…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 <soosinha@amazon.com>
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 <kkewwei@163.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
@soosinha
Use remote publication flag to decide which custom objects to upload (o…
c3c5b5f 
…pensearch-project#14338)

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

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Oct 1, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shiv0408 shiv0408 shiv0408 left review comments

@shwetathareja shwetathareja shwetathareja 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

@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 dblock is a code owner

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

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna 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 nknize is a code owner

@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

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

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

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

@tlfeng tlfeng Awaiting requested review from tlfeng

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

Assignees
No one assigned
Labels
backport 2.x Backport to 2.x branch backport 2.15 skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@soosinha @shwetathareja @shiv0408