-
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
Refactored the RSA to make it more extensible #10254
Conversation
Signed-off-by: Shivansh Arora <shivansh.arora@protonmail.com>
Compatibility status:Checks if related components are compatible with change e2e8f38 Incompatible componentsSkipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/performance-analyzer.git] |
Gradle Check (Jenkins) Run Completed with:
|
It is failing during build as it has dependency on other PR for merge. |
# Conflicts: # server/src/main/java/org/opensearch/gateway/ReplicaShardAllocator.java
❌ Gradle check result for c7d1b88: 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? |
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #10254 +/- ##
============================================
- Coverage 71.42% 71.41% -0.01%
- Complexity 59978 60118 +140
============================================
Files 4985 4991 +6
Lines 282275 282635 +360
Branches 40946 40990 +44
============================================
+ Hits 201603 201846 +243
- Misses 63999 64067 +68
- Partials 16673 16722 +49 ☔ View full report in Codecov by Sentry. |
Thanks for the approval @shwetathareja! |
3a9c20b
into
opensearch-project:main
* Refactored the RSA to make it more extensible Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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-10254-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3a9c20ba394121e73226b48d3e46bf3104a2bde7
# Push it to GitHub
git push --set-upstream origin backport/backport-10254-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 |
* Refactored the RSA to make it more extensible Signed-off-by: Shivansh Arora <hishiv@amazon.com> (cherry picked from commit 3a9c20b) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Refactored the RSA to make it more extensible (cherry picked from commit 3a9c20b) Signed-off-by: Shivansh Arora <hishiv@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>
* Refactored the RSA to make it more extensible Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
In this PR, we are refactoring the ReplicaShardAllocator code to make it more reusable as we bring in Batch Allocator in #8992.
We have broken this function to multiple functions, so that part of codes can be reused and only a single function need to be overwritten in child class to implement the Batch allocator.
OpenSearch/server/src/main/java/org/opensearch/gateway/ReplicaShardAllocator.java
Lines 179 to 183 in 8807d7a
We have also created
NodeShardStore
andNodeShardStores
to encapsulate the data that needs to be passed around in these functions.Related Issues
Resolves #8960
Check List
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.