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.

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

Set tenant ID for predict request #2619

Merged
merged 14 commits into from
Jul 11, 2024
Merged

Set tenant ID for predict request #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
068f0b0
AWS DDB SDK client support for remote data store
arjunkumargiri Jun 13, 2024
e9e209a
AWS DDB SDK client support for remote data store
arjunkumargiri Jun 13, 2024
13d75f4
multi-tenancy for models (create, get, delete, update) + update conne…
dhrubo-os Jun 14, 2024
7d5afbc
[Feature/multi_tenancy] Add source map to GetDataObjectResponse (#2489)
dbwiddis Jun 14, 2024
86aea1b
[Feature/multi_tenancy] Add UpdateDataObject interface, Client, and C…
dbwiddis Jun 14, 2024
20381be
Addressed CR comment
arjunkumargiri Jun 17, 2024
02d0f35
Merge branch 'feature/multi_tenancy' into feature/multi_tenancy
arjunkumargiri Jun 17, 2024
82bddc8
Added javadoc based on feedback
arjunkumargiri Jun 17, 2024
902f5c1
Merge branch 'feature/multi_tenancy' into feature/multi_tenancy
arjunkumargiri Jun 24, 2024
8315ee3
Set tenant ID for predict request
arjunkumargiri Jul 8, 2024
9159fe9
Simplify instantiating Data Object Request/Response builders (#2608)
dbwiddis Jul 3, 2024
a289953
Merge branch 'opensearch-project:feature/multi_tenancy' into feature/…
arjunkumargiri Jul 10, 2024
0c5df38
Merge remote-tracking branch 'origin/feature/multi_tenancy' into mult…
arjunkumargiri Jul 10, 2024
53b4113
Addressed comments
arjunkumargiri Jul 10, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/CI-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ jobs:
- name: Generate Password For Admin
id: genpass
run: |
PASSWORD=$(openssl rand -base64 20 | tr -dc 'A-Za-z0-9!@#$%^&*()_+=-')
echo "password={$PASSWORD}" >> $GITHUB_OUTPUT
PASSWORD=$(openssl rand -base64 20 | tr -dc 'A-Za-z0-9!@#$%^&*()_+=-')
echo "password={$PASSWORD}" >> $GITHUB_OUTPUT
- name: Run Docker Image
if: env.imagePresent == 'true'
run: |
Expand Down
2 changes: 1 addition & 1 deletion ml-algorithms/src/main/java/org/opensearch/ml/engine/indices/MLIndicesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public void initMLIndexIfAbsent(MLIndex index, ActionListener<Boolean> listener)
*/
public void shouldUpdateIndex(String indexName, Integer newVersion, ActionListener<Boolean> listener) {
IndexMetadata indexMetaData = clusterService.state().getMetadata().indices().get(indexName);
if (indexMetaData == null) {
if (indexMetaData == null || indexMetaData.mapping() == null) {
listener.onResponse(Boolean.FALSE);
return;
}
Expand Down
3 changes: 2 additions & 1 deletion ...in/src/main/java/org/opensearch/ml/action/controller/CreateControllerTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<MLCrea

try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
ActionListener<MLCreateControllerResponse> wrappedListener = ActionListener.runBefore(actionListener, context::restore);
mlModelManager.getModel(modelId, null, excludes, ActionListener.wrap(mlModel -> {
// TODO: Add support for multi tenancy
Copy link
Collaborator

Choose a reason for hiding this comment

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

This Controller actions will be disabled for multi-tenancy. @b4sjoo is working on this.

mlModelManager.getModel(modelId, null, null, excludes, ActionListener.wrap(mlModel -> {
FunctionName functionName = mlModel.getAlgorithm();
Boolean isHidden = mlModel.getIsHidden();
if (functionName == TEXT_EMBEDDING || functionName == REMOTE) {
Expand Down
3 changes: 2 additions & 1 deletion ...in/src/main/java/org/opensearch/ml/action/controller/DeleteControllerTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
String[] excludes = new String[] { MLModel.MODEL_CONTENT_FIELD, MLModel.OLD_MODEL_CONTENT_FIELD };
try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
ActionListener<DeleteResponse> wrappedListener = ActionListener.runBefore(actionListener, context::restore);
mlModelManager.getModel(modelId, null, excludes, ActionListener.wrap(mlModel -> {
// TODO: Add support for multi tenancy
mlModelManager.getModel(modelId, null, null, excludes, ActionListener.wrap(mlModel -> {
Boolean isHidden = mlModel.getIsHidden();
modelAccessControlHelper
.validateModelGroupAccess(user, mlModel.getModelGroupId(), client, ActionListener.wrap(hasPermission -> {
Expand Down
3 changes: 2 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/action/controller/GetControllerTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<MLCont
try (XContentParser parser = createXContentParserFromRegistry(xContentRegistry, r.getSourceAsBytesRef())) {
ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
MLController controller = MLController.parse(parser);
mlModelManager.getModel(modelId, null, excludes, ActionListener.wrap(mlModel -> {
// TODO: Add support for multi tenancy
mlModelManager.getModel(modelId, null, null, excludes, ActionListener.wrap(mlModel -> {
Boolean isHidden = mlModel.getIsHidden();
modelAccessControlHelper
.validateModelGroupAccess(user, mlModel.getModelGroupId(), client, ActionListener.wrap(hasPermission -> {
Expand Down
3 changes: 2 additions & 1 deletion ...in/src/main/java/org/opensearch/ml/action/controller/UpdateControllerTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Update

try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
ActionListener<UpdateResponse> wrappedListener = ActionListener.runBefore(actionListener, context::restore);
mlModelManager.getModel(modelId, null, excludes, ActionListener.wrap(mlModel -> {
// TODO: Add support for multi tenancy
mlModelManager.getModel(modelId, null, null, excludes, ActionListener.wrap(mlModel -> {
FunctionName functionName = mlModel.getAlgorithm();
Boolean isHidden = mlModel.getIsHidden();
if (functionName == TEXT_EMBEDDING || functionName == REMOTE) {
Expand Down
6 changes: 5 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/action/deploy/TransportDeployModelAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<MLDepl

try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
ActionListener<MLDeployModelResponse> wrappedListener = ActionListener.runBefore(listener, context::restore);
mlModelManager.getModel(modelId, null, excludes, ActionListener.wrap(mlModel -> {
mlModelManager.getModel(modelId, tenantId, null, excludes, ActionListener.wrap(mlModel -> {
FunctionName functionName = mlModel.getAlgorithm();
Boolean isHidden = mlModel.getIsHidden();
if (!TenantAwareHelper.validateTenantResource(mlFeatureEnabledSetting, tenantId, mlModel.getTenantId(), listener)) {
Expand Down Expand Up @@ -285,6 +285,10 @@ private void deployModel(
String taskId = response.getId();
mlTask.setTaskId(taskId);
if (algorithm == FunctionName.REMOTE) {
if (mlFeatureEnabledSetting.isMultiTenancyEnabled()) {
listener.onResponse(new MLDeployModelResponse(taskId, MLTaskType.DEPLOY_MODEL, MLTaskState.CREATED.name()));
return;
}
mlTaskManager.add(mlTask, eligibleNodeIds);
deployRemoteModel(mlModel, mlTask, localNodeId, eligibleNodes, deployToAllNodes, listener);
return;
Expand Down
1 change: 1 addition & 0 deletions plugin/src/main/java/org/opensearch/ml/action/deploy/TransportDeployModelOnNodeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ private void deployModel(
mlModelManager
.deployModel(
modelId,
null,
modelContentHash,
functionName,
deployToAllNodes,
Expand Down
1 change: 1 addition & 0 deletions plugin/src/main/java/org/opensearch/ml/action/models/GetModelTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<MLMode
.builder()
.index(ML_MODEL_INDEX)
.id(modelId)
.tenantId(tenantId)
.fetchSourceContext(fetchSourceContext)
.build();
User user = RestActionUtils.getUserContext(client);
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/org/opensearch/ml/action/models/UpdateModelTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Update

try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
ActionListener<UpdateResponse> wrappedListener = ActionListener.runBefore(actionListener, context::restore);
mlModelManager.getModel(sdkClient, modelId, null, excludes, ActionListener.wrap(mlModel -> {
mlModelManager.getModel(modelId, tenantId, null, excludes, ActionListener.wrap(mlModel -> {
if (TenantAwareHelper.validateTenantResource(mlFeatureEnabledSetting, tenantId, mlModel.getTenantId(), actionListener)) {
if (!isModelDeploying(mlModel.getModelState())) {
FunctionName functionName = mlModel.getAlgorithm();
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/org/opensearch/ml/action/prediction/TransportPredictionTaskAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public void onFailure(Exception e) {
modelActionListener.onResponse(cachedMlModel);
} else {
// For multi-node cluster, the function name is null in cache, so should always get model first.
mlModelManager.getModel(modelId, modelActionListener);
mlModelManager.getModel(modelId, tenantId, modelActionListener);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ private MLRegisterModelGroupInput createRegisterModelGroupRequest(MLRegisterMode
.backendRoles(registerModelInput.getBackendRoles())
.modelAccessMode(registerModelInput.getAccessMode())
.isAddAllBackendRoles(registerModelInput.getAddAllBackendRoles())
.tenantId(registerModelInput.getTenantId())
.build();
}
}
2 changes: 1 addition & 1 deletion plugin/src/main/java/org/opensearch/ml/action/undeploy/TransportUndeployModelsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private void validateAccess(String modelId, String tenantId, ActionListener<Bool
boolean isSuperAdmin = isSuperAdminUserWrapper(clusterService, client);
String[] excludes = new String[] { MLModel.MODEL_CONTENT_FIELD, MLModel.OLD_MODEL_CONTENT_FIELD };
try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
mlModelManager.getModel(modelId, null, excludes, ActionListener.runBefore(ActionListener.wrap(mlModel -> {
mlModelManager.getModel(modelId, tenantId, null, excludes, ActionListener.runBefore(ActionListener.wrap(mlModel -> {
if (!TenantAwareHelper.validateTenantResource(mlFeatureEnabledSetting, tenantId, mlModel.getTenantId(), listener)) {
return;
}
Expand Down
1 change: 1 addition & 0 deletions plugin/src/main/java/org/opensearch/ml/helper/ConnectorAccessControlHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public void validateConnectorAccess(
GetDataObjectRequest getDataObjectRequest = GetDataObjectRequest
.builder()
.index(ML_CONNECTOR_INDEX)
.tenantId(tenantId)
.id(connectorId)
.fetchSourceContext(fetchSourceContext)
.build();
Expand Down
Loading
Loading