Skip to content

[ML] Accommodate changes to calculation of "model bytes" and "peak mode bytes" values.. #126256

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.

Sign up for GitHub

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

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

[ML] Accommodate changes to calculation of "model bytes" and "peak mode bytes" values.. #126256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4739c5f
[ML] Handle new `actual_memory_usage_bytes` field in model size stats.
edsavage Apr 4, 2025
87cef32
Update docs/changelog/126256.yaml
edsavage Apr 4, 2025
fedbd72
Handle TransportVersions merge conflict
edsavage Apr 4, 2025
dc9eabd
Merge remote-tracking branch 'origin/ad_real_mem_usage' into ad_real_…
edsavage Apr 4, 2025
e2eec0e
Update from main
edsavage Apr 4, 2025
d11e442
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 4, 2025
d67d5d3
Account for C++ code changes
edsavage Apr 9, 2025
60528f7
Revert unneeded MLConfigVersion change
edsavage Apr 9, 2025
b490a5d
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 9, 2025
98a7bdd
Merge branch 'main' of github.com:elasticsearch/elasticsearch into ad…
edsavage May 29, 2025
5d8f06b
Adjust memory limits in Java REST test code
edsavage Jun 5, 2025
1f9ea78
Merge remote-tracking branch 'origin/ad_real_mem_usage' into ad_real_…
edsavage Jun 5, 2025
7c6da1e
Merge branch 'main' of github.com:elasticsearch/elasticsearch into ad…
edsavage Jun 5, 2025
7e0fd66
Adjust memory limits in Java REST test code - again
edsavage Jun 5, 2025
e512582
Remove now unneeded fields.
edsavage Jun 5, 2025
0307736
Further tweak test values
edsavage Jun 5, 2025
0d4a710
Merge branch 'main' of github.com:elasticsearch/elasticsearch into ad…
edsavage Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/126256.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 126256
summary: Adjust REST test code to accommodate changes to calculation of "model bytes" and "peak mode bytes" values.
area: Machine Learning
type: enhancement
issues: []
8 changes: 4 additions & 4 deletions ...src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void testTooManyPartitions() throws Exception {
// Assert we haven't violated the limit too much
GetJobsStatsAction.Response.JobStats jobStats = getJobStats(job.getId()).get(0);
ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
assertThat(modelSizeStats.getModelBytes(), lessThan(32000000L));
assertThat(modelSizeStats.getModelBytes(), lessThan(50300000L));
assertThat(modelSizeStats.getModelBytes(), greaterThan(24000000L));
assertThat(
modelSizeStats.getMemoryStatus(),
Expand Down Expand Up @@ -125,7 +125,7 @@ public void testTooManyByFields() throws Exception {
// Assert we haven't violated the limit too much
GetJobsStatsAction.Response.JobStats jobStats = getJobStats(job.getId()).get(0);
ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
assertThat(modelSizeStats.getModelBytes(), lessThan(35000000L));
assertThat(modelSizeStats.getModelBytes(), lessThan(45000000L));
assertThat(modelSizeStats.getModelBytes(), greaterThan(25000000L));
assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT));
}
Expand Down Expand Up @@ -176,7 +176,7 @@ public void testTooManyByAndOverFields() throws Exception {
// Assert we haven't violated the limit too much
GetJobsStatsAction.Response.JobStats jobStats = getJobStats(job.getId()).get(0);
ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
assertThat(modelSizeStats.getModelBytes(), lessThan(33000000L));
assertThat(modelSizeStats.getModelBytes(), lessThan(72000000L));
assertThat(modelSizeStats.getModelBytes(), greaterThan(24000000L));
assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT));
}
Expand Down Expand Up @@ -226,7 +226,7 @@ public void testManyDistinctOverFields() throws Exception {
GetJobsStatsAction.Response.JobStats jobStats = getJobStats(job.getId()).get(0);
ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
assertThat(modelSizeStats.getModelBytes(), lessThan(120500000L));
assertThat(modelSizeStats.getModelBytes(), greaterThan(90000000L));
assertThat(modelSizeStats.getModelBytes(), greaterThan(70000000L));
assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT));
}

Expand Down
Loading