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

Add POJO classes required for cluster state publication from remote #14006

Merged
merged 14 commits into from
Jun 11, 2024
Merged

Add POJO classes required for cluster state publication from remote #14006

merged 14 commits into from
Jun 11, 2024

Conversation

shiv0408
Copy link
Member

@shiv0408 shiv0408 commented Jun 5, 2024 •
edited
Loading

Description

Add the POJO classes required for publication of cluster state from remote repository.

Related Issues

Resolves #13791

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • API changes companion pull request created.
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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 bot added Cluster Manager ClusterManager:RemoteState enhancement Enhancement or improvement to existing feature or request labels Jun 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 5, 2024

❌ Gradle check result for 573e96f: 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

github-actions bot commented Jun 7, 2024

❌ Gradle check result for a1b0a70: 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

github-actions bot commented Jun 7, 2024

❌ Gradle check result for 661b44a: 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

github-actions bot commented Jun 7, 2024

❌ Gradle check result for 9d73439: 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

github-actions bot commented Jun 7, 2024

❌ Gradle check result for eef8768: 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

github-actions bot commented Jun 7, 2024

❌ Gradle check result for 99870a1:

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?

shiv0408 and others added 2 commits June 8, 2024 15:20
@shiv0408
Add POJO classes required for cluster state publication from remote
255075c 
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
@Arpit-Bandejiya @shiv0408
Add remote routing table changes in diff Manifest
c83706a 
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
@shiv0408 shiv0408 force-pushed the remote_state_pojos branch from 99870a1 to ed2e33e Compare June 8, 2024 09:57
@shiv0408
Use InputStreams rather than XContent for serialization
830b002 
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
@shiv0408 shiv0408 force-pushed the remote_state_pojos branch from ed2e33e to 830b002 Compare June 8, 2024 10:02
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 8, 2024

❌ Gradle check result for ed2e33e: 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

github-actions bot commented Jun 8, 2024

❌ Gradle check result for 830b002: 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?

@shiv0408 shiv0408 added the v2.15.0 Issues and PRs related to version 2.15.0 label Jun 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 8, 2024

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

shwetathareja
shwetathareja reviewed Jun 9, 2024
View reviewed changes
server/src/main/java/org/opensearch/gateway/remote/ClusterMetadataManifest.java Show resolved Hide resolved
server/src/main/java/org/opensearch/gateway/remote/ClusterMetadataManifest.java Show resolved Hide resolved
server/src/main/java/org/opensearch/gateway/remote/ClusterMetadataManifest.java Show resolved Hide resolved
server/src/main/java/org/opensearch/gateway/remote/ClusterMetadataManifest.java Show resolved Hide resolved
server/src/main/java/org/opensearch/gateway/remote/ClusterStateDiffManifest.java Outdated Show resolved Hide resolved
server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterBlocks.java Outdated Show resolved Hide resolved
server/src/main/java/org/opensearch/gateway/remote/model/RemoteReadResult.java Show resolved Hide resolved
@shiv0408 shiv0408 marked this pull request as ready for review June 9, 2024 15:12
@shiv0408 shiv0408 requested a review from anasalkouz as a code owner June 9, 2024 15:12
@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for 20cb7c0: SUCCESS

@soosinha
Merge branch 'main' into remote_state_pojos
721bc18 
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
@soosinha soosinha force-pushed the remote_state_pojos branch from f6d36c2 to 721bc18 Compare June 11, 2024 03:09
@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for f6d36c2: 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 721bc18:

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 721bc18: SUCCESS

@shwetathareja shwetathareja merged commit a9d2050 into opensearch-project:main Jun 11, 2024
30 checks passed
@shwetathareja shwetathareja added the backport 2.x Backport to 2.x branch label Jun 11, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-14006-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a9d20502ae84148f564da33a82b13ba0f60ec8ac
# Push it to GitHub
git push --set-upstream origin backport/backport-14006-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-14006-to-2.x.

@shwetathareja
Copy link
Member

@shiv0408 please raise manual backport and update version checks accordingly.

@soosinha soosinha mentioned this pull request Jun 11, 2024
Closed
9 tasks
shiv0408 added a commit to shiv0408/OpenSearch that referenced this pull request Jun 11, 2024
@shiv0408
Add POJO classes required for cluster state publication from remote (o…
5647976 
…pensearch-project#14006)

* Add POJO classes required for cluster state publication from remote
* Use InputStreams rather than XContent for serialization for ehpemeral objects
Signed-off-by: Shivansh Arora <hishiv@amazon.com>

* Add remote routing table changes in diff Manifest
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>

(cherry picked from commit a9d2050)
@shiv0408 shiv0408 mentioned this pull request Jun 11, 2024
Merged
shwetathareja pushed a commit that referenced this pull request Jun 11, 2024
@shiv0408
Add POJO classes required for cluster state publication from remote (#…
66a5eb9 
…14006) (#14172)

* Add POJO classes required for cluster state publication from remote
* Use InputStreams rather than XContent for serialization for ehpemeral objects
Signed-off-by: Shivansh Arora <hishiv@amazon.com>

* Add remote routing table changes in diff Manifest
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>

(cherry picked from commit a9d2050)
@shiv0408 shiv0408 deleted the remote_state_pojos branch June 11, 2024 19:12
@shiv0408 shiv0408 mentioned this pull request Jun 13, 2024
Merged
3 tasks
This was referenced Jun 13, 2024
Open
Open
Open
Open
Open
@finnegancarroll finnegancarroll mentioned this pull request Jun 14, 2024
Merged
3 tasks
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
@shiv0408 @kkewwei
Add POJO classes required for cluster state publication from remote (o…
c550d74 
…pensearch-project#14006) (opensearch-project#14172)

* Add POJO classes required for cluster state publication from remote
* Use InputStreams rather than XContent for serialization for ehpemeral objects
Signed-off-by: Shivansh Arora <hishiv@amazon.com>

* Add remote routing table changes in diff Manifest
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>

(cherry picked from commit a9d2050)
Signed-off-by: kkewwei <kkewwei@163.com>
@shiv0408 shiv0408 self-assigned this Aug 5, 2024
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
@shiv0408
Add POJO classes required for cluster state publication from remote (o…
32e87fc 
…pensearch-project#14006)

* Add POJO classes required for cluster state publication from remote
* Use InputStreams rather than XContent for serialization for ehpemeral objects
Signed-off-by: Shivansh Arora <hishiv@amazon.com>

* Add remote routing table changes in diff Manifest
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
This was referenced Sep 6, 2024
Open
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soosinha soosinha soosinha left review comments

@Bukhtawar Bukhtawar Bukhtawar left review comments

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

@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

@shiv0408 shiv0408

Labels
backport 2.x Backport to 2.x branch backport-failed Cluster Manager ClusterManager:RemoteState enhancement Enhancement or improvement to existing feature or request skip-changelog v2.15.0 Issues and PRs related to version 2.15.0
Projects
Cluster Manager Project Board
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Remote Cluster State] Create interfaces for remote cluster state
6 participants
@shiv0408 @Arpit-Bandejiya @shwetathareja @himshikha @Bukhtawar @soosinha