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

[Remote state] Integrate remote cluster state in publish/commit flow #9665

Merged

Conversation

soosinha
Copy link
Member

@soosinha soosinha commented Aug 31, 2023

Description

Follow up PR for : #9160
In the above PR, RemotePersistedState and RemoteClusterStateService were created. In the current PR, these classes are integrated into the cluster state publish flow. The upload of cluster metadata will happen just before the cluster state publish request is sent to all nodes

Related Issues

#9338

Previous PR in forked repo: soosinha#3

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 198b091

Incompatible components

Skipped components

Compatible components

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Member

@shwetathareja shwetathareja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still going through, publishing initial comments

@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change ce7c21a

Incompatible components

Skipped components

Compatible components

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.index.shard.RemoteIndexShardTests.testNRTReplicaWithRemoteStorePromotedAsPrimaryRefreshCommit

@codecov
Copy link

codecov bot commented Aug 31, 2023

Codecov Report

Merging #9665 (8729c72) into main (079c3e9) will increase coverage by 0.08%.
Report is 2 commits behind head on main.
The diff coverage is 82.85%.

@@             Coverage Diff              @@
##               main    #9665      +/-   ##
============================================
+ Coverage     71.09%   71.18%   +0.08%     
- Complexity    57743    57800      +57     
============================================
  Files          4806     4807       +1     
  Lines        272202   272245      +43     
  Branches      39723    39730       +7     
============================================
+ Hits         193531   193801     +270     
+ Misses        62413    62177     -236     
- Partials      16258    16267       +9     
Files Changed Coverage Δ
...java/org/opensearch/discovery/DiscoveryModule.java 90.27% <ø> (ø)
server/src/main/java/org/opensearch/node/Node.java 85.52% <53.84%> (-0.59%) ⬇️
...arch/gateway/remote/RemoteClusterStateService.java 78.62% <83.33%> (+0.14%) ⬆️
.../java/org/opensearch/gateway/GatewayMetaState.java 67.32% <85.71%> (+1.55%) ⬆️
...search/cluster/coordination/CoordinationState.java 88.39% <90.90%> (-0.22%) ⬇️
...h/cluster/coordination/PersistedStateRegistry.java 91.66% <91.66%> (ø)
...g/opensearch/cluster/coordination/Coordinator.java 78.41% <100.00%> (-0.10%) ⬇️

... and 453 files with indirect coverage changes

Copy link
Collaborator

@linuxpi linuxpi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor comment, Otherwise LGTM.

Also, please fix DCO and precommit checks

@soosinha soosinha force-pushed the remote_state_integrate branch from 5a1c2d2 to 81e1a24 Compare September 2, 2023 16:19
@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2023

Compatibility status:

Checks if related components are compatible with change 81e1a24

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testStatsResponseAllShards

@soosinha soosinha force-pushed the remote_state_integrate branch from 81e1a24 to 2311dd7 Compare September 2, 2023 17:02
@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2023

Compatibility status:

Checks if related components are compatible with change 2311dd7

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git]

@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Member

@shwetathareja shwetathareja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comment, rest looks good @soosinha

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Sooraj Sinha <[email protected]>
@soosinha soosinha force-pushed the remote_state_integrate branch from 379010a to 8729c72 Compare September 4, 2023 02:14
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

Compatibility status:

Checks if related components are compatible with change 379010a

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git]

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

Compatibility status:

Checks if related components are compatible with change 8729c72

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git]

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

Gradle Check (Jenkins) Run Completed with:

@shwetathareja shwetathareja merged commit d375e4c into opensearch-project:main Sep 4, 2023
@shwetathareja shwetathareja added the backport 2.x Backport to 2.x branch label Sep 4, 2023
@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-9665-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d375e4cfea1a8e4c58dd1409365a67cf49366780
# Push it to GitHub
git push --set-upstream origin backport/backport-9665-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-9665-to-2.x.

soosinha added a commit to soosinha/OpenSearch that referenced this pull request Sep 5, 2023
…pensearch-project#9665)

* Integrate remote cluster state in publish/commit flow

Signed-off-by: Sooraj Sinha <[email protected]>
(cherry picked from commit d375e4c)
soosinha added a commit to soosinha/OpenSearch that referenced this pull request Sep 6, 2023
…pensearch-project#9665)

* Integrate remote cluster state in publish/commit flow

Signed-off-by: Sooraj Sinha <[email protected]>
(cherry picked from commit d375e4c)
sachinpkale pushed a commit that referenced this pull request Sep 6, 2023
…9665) (#9751)

* Integrate remote cluster state in publish/commit flow

Signed-off-by: Sooraj Sinha <[email protected]>
(cherry picked from commit d375e4c)
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…pensearch-project#9665)

* Integrate remote cluster state in publish/commit flow

Signed-off-by: Sooraj Sinha <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…pensearch-project#9665)

* Integrate remote cluster state in publish/commit flow

Signed-off-by: Sooraj Sinha <[email protected]>
Signed-off-by: Ivan Brusic <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…pensearch-project#9665)

* Integrate remote cluster state in publish/commit flow

Signed-off-by: Sooraj Sinha <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
@soosinha soosinha deleted the remote_state_integrate branch December 20, 2024 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants