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

Fix scale up for model allocations #115189

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Conversation

jan-elastic
Copy link
Contributor

@jan-elastic jan-elastic commented Oct 21, 2024

Fixes: #114930

@jan-elastic jan-elastic added >non-issue :ml Machine learning Team:ML Meta label for the ML team v8.16.0 v9.0.0 labels Oct 21, 2024
@jan-elastic jan-elastic requested a review from davidkyle October 21, 2024 09:06
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/ml-core (Team:ML)

@@ -177,7 +177,7 @@ public boolean isEmpty() {
return anomalyDetectionTasks.isEmpty()
&& snapshotUpgradeTasks.isEmpty()
&& dataframeAnalyticsTasks.isEmpty()
&& modelAssignments.values().stream().allMatch(assignment -> assignment.totalTargetAllocations() == 0);
&& modelAssignments.values().stream().allMatch(assignment -> assignment.getTaskParams().getNumberOfAllocations() == 0);
Copy link
Contributor Author

@jan-elastic jan-elastic Oct 21, 2024

Choose a reason for hiding this comment

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

This code is so confusing...

Anyway, assignment.totalTargetAllocations() is the number of allocations assigned to ML nodes, but if there are no nodes, there are no assigned allocations. assignment.getTaskParams().getNumberOfAllocations() is the number that's wanted.

I've also added a test for this.

Copy link
Member

@davidkyle davidkyle left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -177,7 +177,7 @@ public boolean isEmpty() {
return anomalyDetectionTasks.isEmpty()
&& snapshotUpgradeTasks.isEmpty()
&& dataframeAnalyticsTasks.isEmpty()
&& modelAssignments.values().stream().allMatch(assignment -> assignment.totalTargetAllocations() == 0);
&& modelAssignments.values().stream().allMatch(assignment -> assignment.getTaskParams().getNumberOfAllocations() == 0);
Copy link
Member

Choose a reason for hiding this comment

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

Oh because if there are no ml nodes in the cluster assignment.totalTargetAllocations() == 0 even if assignment.getTaskParams().getNumberOfAllocations() > 0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, indeed

@jan-elastic jan-elastic merged commit af18f10 into main Oct 21, 2024
17 checks passed
@jan-elastic jan-elastic deleted the fix-trained-model-scaleup branch October 21, 2024 10:34
salvatore-campagna pushed a commit to salvatore-campagna/elasticsearch that referenced this pull request Oct 21, 2024
saarikabhasi added a commit to elastic/kibana that referenced this pull request Oct 22, 2024
## Summary

Semantic text feature was disabled by default due to ML node unable to
scale down. With the relevant
[PR](elastic/elasticsearch#114323) & subsequent
[fix](elastic/elasticsearch#115189) merged, ML
node now auto scales when there is no activity. Therefore enabling
semantic_text feature in es3.

### Testing instructions
* start serverless instance
* visit index management index details page -> mappings
* Click Add field 
* Confirm `semantic_text` is shown in the field type form
georgewallace pushed a commit to georgewallace/elasticsearch that referenced this pull request Oct 25, 2024
jfreden pushed a commit to jfreden/elasticsearch that referenced this pull request Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:ml Machine learning >non-issue Team:ML Meta label for the ML team v8.16.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ML] ML nodes autoscaling not down to 0 in stateful and serverless
3 participants