[ML] stop using isAllowedByLicense for model license checks #79908
Conversation
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
|
Pinging @elastic/ml-core (Team:ML) |
|
@rjernst is this required for 8.0.0? Or is 8.1.0 OK? |
|
8.1.0 is fine, there is no rush. This is just a general direction for the license state to simplify it. |
przemekwitek
approved these changes
Oct 28, 2021
...in/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportInternalInferModelAction.java
Outdated
Show resolved
Hide resolved
…-xpack-license-method
benwtrent
added
the
auto-merge-without-approval
rjernst
reviewed
Oct 28, 2021
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningField.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningField.java
Outdated
Show resolved
Hide resolved
benwtrent
removed
the
auto-merge-without-approval
benwtrent
commented
Oct 28, 2021
.../plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Przemysław Witek <przemyslaw.witek@elastic.co>
benwtrent
added
the
auto-merge-without-approval
rjernst
reviewed
Oct 28, 2021
| @@ -40,6 +41,12 @@ | |||
| License.OperationMode.PLATINUM | |||
| ); | |||
|
|
|||
| public static final LicensedFeature.Momentary ML_MODEL_INFERENCE_PLATINUM_FEATURE = LicensedFeature.momentary( | |||
| MachineLearningField.ML_FEATURE_FAMILY, | |||
| "model-inference-platinum-check", | |||
There was a problem hiding this comment.
@benwtrent Followup thought: this string is meant to be sent to users. Is there something we could use that doesn't have the license level or "check" in it? It's meant to be a short descriptor of what the feature is. How do these two license levels (basic vs platinum) for model inference differ?
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Oct 28, 2021
…formance * upstream/master: (153 commits) [ML] update truncation default & adding field output when input is truncated (elastic#79942) [ML] stop using isAllowedByLicense for model license checks (elastic#79908) [ML] Retain built-in ML roles granting Kibana privileges (elastic#80014) [Transform] remove old mixed cluster BWC layers, not required for 8x (elastic#79927) Increase test timeout for CoordinatorTests testAllSearchesExecuted [Transform] add rolling upgrade tests for upgrade endpoint (elastic#79721) [ML] Update trained model docs for truncate parameter for bert tokenization (elastic#79652) `CoordinatorTests` sometimes needs three term bumps (elastic#79574) [ML] Account for service being triggered twice in tests (elastic#80000) SearchContext: remove unused variable (elastic#79917) Revert "Deprecate resolution loss on date field (elastic#78921)" (elastic#79914) Re-enable GeoIpDownloaderIT#testStartWithNoDatabases() (elastic#79907) Fix SnapshotBasedIndexRecoveryIT#testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver (elastic#79469) Fix RecoverySourceHandlerTests (elastic#79546) SQL: stabilize SqlSearchPageTimeoutIT (elastic#79928) Wait 3 seconds for the server to reload trust (elastic#79778) Skip automatically preserved request headers when rewriting (elastic#79973) Check whether stdout is a real console (elastic#79882) Convert remote license checker to use LicensedFeature (elastic#79876) Miscellaneous fixes for LDAP SDK v6 upgrade (elastic#79891) ... # Conflicts: # libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java # libs/x-content/src/test/java/org/elasticsearch/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java # libs/x-content/src/test/java/org/elasticsearch/xcontent/support/filtering/FilterPathTests.java
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 28, 2021
Since trained models require either a platinum or basic license, our license checking can be simplified. Now, we check if ML APIs are allowed (platinum) or if the trained model is `basic`. relates to: #79908
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For trained models, there are both basic and platinum licenses allowed.
We should track the feature usage check based on the license operation mode instead of using the underlying isAllowedByLicense.
closes: #79811