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

Jump to bottom

[Backport Feature/multi tenancy] Add feature enable setting for controller index (in MLModelManager) #2973

Closed
wants to merge 1 commit into from
Closed

[Backport Feature/multi tenancy] Add feature enable setting for controller index (in MLModelManager) #2973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/model/MLModelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
import org.opensearch.ml.engine.indices.MLIndicesHandler;
import org.opensearch.ml.engine.utils.FileUtils;
import org.opensearch.ml.profile.MLModelProfile;
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
import org.opensearch.ml.stats.ActionName;
import org.opensearch.ml.stats.MLActionLevelStat;
import org.opensearch.ml.stats.MLNodeLevelStat;
Expand Down Expand Up @@ -178,6 +179,7 @@ public class MLModelManager {
private final MLTaskManager mlTaskManager;
private final MLEngine mlEngine;
private final DiscoveryNodeHelper nodeHelper;
private final MLFeatureEnabledSetting mlFeatureEnabledSetting;

private volatile Integer maxModelPerNode;
private volatile Integer maxRegisterTasksPerNode;
Expand Down Expand Up @@ -208,7 +210,8 @@ public MLModelManager(
MLTaskManager mlTaskManager,
MLModelCacheHelper modelCacheHelper,
MLEngine mlEngine,
DiscoveryNodeHelper nodeHelper
DiscoveryNodeHelper nodeHelper,
MLFeatureEnabledSetting mlFeatureEnabledSetting
) {
this.client = client;
this.sdkClient = sdkClient;
Expand All @@ -224,6 +227,7 @@ public MLModelManager(
this.mlTaskManager = mlTaskManager;
this.mlEngine = mlEngine;
this.nodeHelper = nodeHelper;
this.mlFeatureEnabledSetting = mlFeatureEnabledSetting;

this.maxModelPerNode = ML_COMMONS_MAX_MODELS_PER_NODE.get(settings);
clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_MAX_MODELS_PER_NODE, it -> maxModelPerNode = it);
Expand Down
3 changes: 2 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,8 @@ public Collection<Object> createComponents(
mlTaskManager,
modelCacheHelper,
mlEngine,
nodeHelper
nodeHelper,
mlFeatureEnabledSetting
);
mlInputDatasetHandler = new MLInputDatasetHandler(client);
modelAccessControlHelper = new ModelAccessControlHelper(clusterService, settings);
Expand Down
6 changes: 5 additions & 1 deletion plugin/src/test/java/org/opensearch/ml/model/MLModelManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
import org.opensearch.ml.engine.encryptor.EncryptorImpl;
import org.opensearch.ml.engine.indices.MLIndicesHandler;
import org.opensearch.ml.sdkclient.SdkClientFactory;
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
import org.opensearch.ml.stats.ActionName;
import org.opensearch.ml.stats.MLActionLevelStat;
import org.opensearch.ml.stats.MLNodeLevelStat;
Expand Down Expand Up @@ -208,6 +209,8 @@ public class MLModelManagerTests extends OpenSearchTestCase {

@Mock
private MLTask pretrainedMLTask;
@Mock
MLFeatureEnabledSetting mlFeatureEnabledSetting;

@Before
public void setup() throws URISyntaxException, IOException {
Expand Down Expand Up @@ -301,7 +304,8 @@ public void setup() throws URISyntaxException, IOException {
mlTaskManager,
modelCacheHelper,
mlEngine,
nodeHelper
nodeHelper,
mlFeatureEnabledSetting
)
);

Expand Down
Loading