-
Notifications
You must be signed in to change notification settings - Fork 138
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
Fix unassigned ml system shard replicas #1315
Conversation
Signed-off-by: Sicheng Song <[email protected]>
plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java
Outdated
Show resolved
Hide resolved
plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java
Outdated
Show resolved
Hide resolved
plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java
Outdated
Show resolved
Hide resolved
…etting Signed-off-by: Sicheng Song <[email protected]>
…r.java Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]>
plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java
Outdated
Show resolved
Hide resolved
plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java
Outdated
Show resolved
Hide resolved
Codecov Report
@@ Coverage Diff @@
## 2.x #1315 +/- ##
============================================
- Coverage 79.40% 79.20% -0.20%
+ Complexity 2247 2245 -2
============================================
Files 188 188
Lines 9074 9089 +15
Branches 903 904 +1
============================================
- Hits 7205 7199 -6
- Misses 1461 1481 +20
- Partials 408 409 +1
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Signed-off-by: Sicheng Song <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
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.
LGTM. Thanks for the change!
* Fix unassigned ml system shard replicas Signed-off-by: Sicheng Song <[email protected]> * Adjust auto replica settings to keep it consistent with AOS default setting Signed-off-by: Sicheng Song <[email protected]> * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]> * Modify exception handling Signed-off-by: Sicheng Song <[email protected]> * Modify exception messages Signed-off-by: Sicheng Song <[email protected]> * Add response check Signed-off-by: Sicheng Song <[email protected]> * Add response check and exception handling Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> (cherry picked from commit 56976e1)
* Fix unassigned ml system shard replicas Signed-off-by: Sicheng Song <[email protected]> * Adjust auto replica settings to keep it consistent with AOS default setting Signed-off-by: Sicheng Song <[email protected]> * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]> * Modify exception handling Signed-off-by: Sicheng Song <[email protected]> * Modify exception messages Signed-off-by: Sicheng Song <[email protected]> * Add response check Signed-off-by: Sicheng Song <[email protected]> * Add response check and exception handling Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> (cherry picked from commit 56976e1)
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1315-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 56976e1078e445f27f2358cf066ec45a9d012a9a
# Push it to GitHub
git push --set-upstream origin backport/backport-1315-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
* Fix unassigned ml system shard replicas Signed-off-by: Sicheng Song <[email protected]> * Adjust auto replica settings to keep it consistent with AOS default setting Signed-off-by: Sicheng Song <[email protected]> * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]> * Modify exception handling Signed-off-by: Sicheng Song <[email protected]> * Modify exception messages Signed-off-by: Sicheng Song <[email protected]> * Add response check Signed-off-by: Sicheng Song <[email protected]> * Add response check and exception handling Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]>
* Fix unassigned ml system shard replicas Signed-off-by: Sicheng Song <[email protected]> * Adjust auto replica settings to keep it consistent with AOS default setting Signed-off-by: Sicheng Song <[email protected]> * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]> * Modify exception handling Signed-off-by: Sicheng Song <[email protected]> * Modify exception messages Signed-off-by: Sicheng Song <[email protected]> * Add response check Signed-off-by: Sicheng Song <[email protected]> * Add response check and exception handling Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> (cherry picked from commit 56976e1) Co-authored-by: Sicheng Song <[email protected]>
* Fix unassigned ml system shard replicas Signed-off-by: Sicheng Song <[email protected]> * Adjust auto replica settings to keep it consistent with AOS default setting Signed-off-by: Sicheng Song <[email protected]> * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java Co-authored-by: Yaliang Wu <[email protected]> Signed-off-by: Sicheng Song <[email protected]> * Modify exception handling Signed-off-by: Sicheng Song <[email protected]> * Modify exception messages Signed-off-by: Sicheng Song <[email protected]> * Add response check Signed-off-by: Sicheng Song <[email protected]> * Add response check and exception handling Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> * Keep error message consistent Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> (cherry picked from commit 56976e1) Co-authored-by: Sicheng Song <[email protected]>
* Fix unassigned ml system shard replicas * Adjust auto replica settings to keep it consistent with AOS default setting * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java * Modify exception handling * Modify exception messages * Add response check * Add response check and exception handling * Keep error message consistent * Keep error message consistent * Keep error message consistent --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]>
* Add Auto Release Workflow (#1306) * Add Auto Release Workflow Signed-off-by: Sicheng Song <[email protected]> * Fix release note address Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> * Bump aws-encryption-sdk-java to fix CVE-2023-33201 (#1309) Signed-off-by: Sicheng Song <[email protected]> * Add release note for 2.10.0 release (#1312) * Add release note for 2.10.0 Signed-off-by: Sicheng Song <[email protected]> * Add CVE fix Signed-off-by: Sicheng Song <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> * fixing doc link (#1318) * fixing doc link Signed-off-by: Dhrubo Saha <[email protected]> * fixing indentation Signed-off-by: Dhrubo Saha <[email protected]> --------- Signed-off-by: Dhrubo Saha <[email protected]> * Fix unassigned ml system shard replicas (#1315) (#1324) * Fix unassigned ml system shard replicas * Adjust auto replica settings to keep it consistent with AOS default setting * Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java * Modify exception handling * Modify exception messages * Add response check * Add response check and exception handling * Keep error message consistent * Keep error message consistent * Keep error message consistent --------- Signed-off-by: Sicheng Song <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> * Adjust index replicas settings to keep consistent with AOS 2.9 (#1325) Signed-off-by: Sicheng Song <[email protected]> * Make 2.10 release notes up to date (#1345) Signed-off-by: Sicheng Song <[email protected]> * fix spelling (#1363) Signed-off-by: Kalyan <[email protected]> * Add neural search default processor for non OpenAI/Cohere scenario (#1274) * Add neural search default pre/post process function support Signed-off-by: zane-neo <[email protected]> * Fix UT failures Signed-off-by: zane-neo <[email protected]> * Address PR comment to remove nonJson response case Signed-off-by: zane-neo <[email protected]> * Fix low code coverage issue Signed-off-by: zane-neo <[email protected]> * fix format issue Signed-off-by: zane-neo <[email protected]> * Try to fix classNotFound issue in IT Signed-off-by: zane-neo <[email protected]> * revert Try to fix classNotFound issue in IT Signed-off-by: zane-neo <[email protected]> * Change gson dependency to compileOnly Signed-off-by: zane-neo <[email protected]> * Change default pre/post process function name Signed-off-by: zane-neo <[email protected]> * Address code review comments Signed-off-by: zane-neo <[email protected]> * Make preprocess function to default Signed-off-by: zane-neo <[email protected]> * Remove GsonUtil since there already a single instance in StringUtils Signed-off-by: zane-neo <[email protected]> * Fix UT failures Signed-off-by: zane-neo <[email protected]> * Address comments Signed-off-by: zane-neo <[email protected]> * use import instead of fully qualified name Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: Sicheng Song <[email protected]> Signed-off-by: Dhrubo Saha <[email protected]> Signed-off-by: Kalyan <[email protected]> Signed-off-by: zane-neo <[email protected]> Co-authored-by: Sicheng Song <[email protected]> Co-authored-by: Dhrubo Saha <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> Co-authored-by: Kalyan <[email protected]>
Description
In previous ml system shard replicas always stays on an arbitrary number and cannot expand automatically, which will cause unassigned shards and yellow cluster problem. This PR can resolve this issue.
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.