-
Notifications
You must be signed in to change notification settings - Fork 25k
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
[ML] track inference model feature usage per node #79752
Merged
elasticsearchmachine
merged 3 commits into
elastic:master
from
benwtrent:feature/ml-track-model-inference-deployments
Oct 26, 2021
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...java/org/elasticsearch/xpack/ml/inference/deployment/TrainedModelDeploymentTaskTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.ml.inference.deployment; | ||
|
|
||
| import org.elasticsearch.license.XPackLicenseState; | ||
| import org.elasticsearch.tasks.TaskId; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.xpack.core.ml.action.StartTrainedModelDeploymentAction; | ||
| import org.elasticsearch.xpack.core.ml.inference.trainedmodel.PassThroughConfig; | ||
| import org.elasticsearch.xpack.ml.inference.allocation.TrainedModelAllocationNodeService; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import static org.elasticsearch.xpack.core.ml.MlTasks.TRAINED_MODEL_ALLOCATION_TASK_NAME_PREFIX; | ||
| import static org.elasticsearch.xpack.core.ml.MlTasks.TRAINED_MODEL_ALLOCATION_TASK_TYPE; | ||
| import static org.elasticsearch.xpack.ml.MachineLearning.ML_MODEL_INFERENCE_FEATURE; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
|
|
||
| public class TrainedModelDeploymentTaskTests extends ESTestCase { | ||
|
|
||
| void assertTrackingComplete(Consumer<TrainedModelDeploymentTask> method, String modelId) { | ||
| XPackLicenseState licenseState = mock(XPackLicenseState.class); | ||
| TrainedModelDeploymentTask task = new TrainedModelDeploymentTask( | ||
| 0, | ||
| TRAINED_MODEL_ALLOCATION_TASK_TYPE, | ||
| TRAINED_MODEL_ALLOCATION_TASK_NAME_PREFIX + modelId, | ||
| TaskId.EMPTY_TASK_ID, | ||
| Map.of(), | ||
| new StartTrainedModelDeploymentAction.TaskParams( | ||
| modelId, | ||
| randomLongBetween(1, Long.MAX_VALUE), | ||
| randomInt(5), | ||
| randomInt(5), | ||
| randomInt(5) | ||
| ), | ||
| mock(TrainedModelAllocationNodeService.class), | ||
| licenseState); | ||
|
|
||
| task.init(new PassThroughConfig(null, null, null)); | ||
| verify(licenseState, times(1)).enableUsageTracking(ML_MODEL_INFERENCE_FEATURE, "model-" + modelId); | ||
| method.accept(task); | ||
| verify(licenseState, times(1)).disableUsageTracking(ML_MODEL_INFERENCE_FEATURE, "model-" + modelId); | ||
| } | ||
|
|
||
| public void testOnStopWithoutNotification() { | ||
| assertTrackingComplete(t -> t.stopWithoutNotification("foo"), randomAlphaOfLength(10)); | ||
| } | ||
|
|
||
| public void testOnStop() { | ||
| assertTrackingComplete(t -> t.stop("foo"), randomAlphaOfLength(10)); | ||
| } | ||
|
|
||
| public void testCancelled() { | ||
| assertTrackingComplete(TrainedModelDeploymentTask::onCancelled, randomAlphaOfLength(10)); | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
@rjernst I made these public for testing purposes, I need to check if tracking is enabled/disabled for inference in a different package.
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.
It's a shame to do this so
TrainedModelDeploymentTaskTestscan verifyTrainedModelDeploymentTaskcallsstart/stopTracking. Instead of statically importingMachineLearning.ML_MODEL_INFERENCE_FEATUREyou could pass theLicensedFeatureas a ctor parameter and mock aLicensedFeaturein the tests which can be verifiedThere 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.
fixed, I am passing in the value now as @davidkyle suggests, these changes are removed.
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.
Note for future reference there is a test class called
MockLicenseStatethat makes these package private methods public for testing purposes, so there shouldn't ever be a need to make them public on XPackLicenseState.