-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Restore ClusterState version during remote state restore #10853
Restore ClusterState version during remote state restore #10853
Conversation
Compatibility status:Checks if related components are compatible with change b39b696 Incompatible componentsIncompatible components: [https://github.com/opensearch-project/performance-analyzer.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/neural-search.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-rca.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git] |
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #10853 +/- ##
============================================
- Coverage 71.23% 71.16% -0.08%
+ Complexity 58730 58695 -35
============================================
Files 4872 4872
Lines 276707 276712 +5
Branches 40222 40222
============================================
- Hits 197124 196923 -201
- Misses 63115 63377 +262
+ Partials 16468 16412 -56
|
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: bansvaru <bansvaru@amazon.com>
Signed-off-by: bansvaru <bansvaru@amazon.com>
1730b9d
to
978a073
Compare
Signed-off-by: bansvaru <bansvaru@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: bansvaru <bansvaru@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: bansvaru <bansvaru@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: bansvaru <bansvaru@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to add assertions to the existing tests to validate that the ClusterState version is indeed restored?
...rc/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
Outdated
Show resolved
Hide resolved
Signed-off-by: bansvaru <bansvaru@amazon.com>
Signed-off-by: bansvaru <bansvaru@amazon.com>
We have added assertions to validate new cluster state version would always be greater than previous version |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @linuxpi!
73bbeb5
into
opensearch-project:main
The backport to
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-10853-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 73bbeb57a8a56de0d1f9cf69e711a8a0ff26afe5
# Push it to GitHub
git push --set-upstream origin backport/backport-10853-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 |
will raise the backport pr manually |
…project#10853) * Restore ClusterState version during remote state restore Signed-off-by: bansvaru <bansvaru@amazon.com> (cherry picked from commit 73bbeb5)
…project#10853) * Restore ClusterState version during remote state restore Signed-off-by: bansvaru <bansvaru@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
Related Issues
Resolves #10692
Check List
New functionality has javadoc addedFailing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)Public documentation issue/PR createdBy 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.