Skip to content

Commit e184239

Browse files
committed
Introduce MLFeatureEnabledSetting to MLModelManager
Signed-off-by: b4sjoo <sicheng.song@outlook.com>
1 parent d59fced commit e184239

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

plugin/src/main/java/org/opensearch/ml/model/MLModelManager.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
import org.opensearch.ml.engine.indices.MLIndicesHandler;
132132
import org.opensearch.ml.engine.utils.FileUtils;
133133
import org.opensearch.ml.profile.MLModelProfile;
134+
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
134135
import org.opensearch.ml.stats.ActionName;
135136
import org.opensearch.ml.stats.MLActionLevelStat;
136137
import org.opensearch.ml.stats.MLNodeLevelStat;
@@ -178,6 +179,7 @@ public class MLModelManager {
178179
private final MLTaskManager mlTaskManager;
179180
private final MLEngine mlEngine;
180181
private final DiscoveryNodeHelper nodeHelper;
182+
private final MLFeatureEnabledSetting mlFeatureEnabledSetting;
181183

182184
private volatile Integer maxModelPerNode;
183185
private volatile Integer maxRegisterTasksPerNode;
@@ -208,7 +210,8 @@ public MLModelManager(
208210
MLTaskManager mlTaskManager,
209211
MLModelCacheHelper modelCacheHelper,
210212
MLEngine mlEngine,
211-
DiscoveryNodeHelper nodeHelper
213+
DiscoveryNodeHelper nodeHelper,
214+
MLFeatureEnabledSetting mlFeatureEnabledSetting
212215
) {
213216
this.client = client;
214217
this.sdkClient = sdkClient;
@@ -224,6 +227,7 @@ public MLModelManager(
224227
this.mlTaskManager = mlTaskManager;
225228
this.mlEngine = mlEngine;
226229
this.nodeHelper = nodeHelper;
230+
this.mlFeatureEnabledSetting = mlFeatureEnabledSetting;
227231

228232
this.maxModelPerNode = ML_COMMONS_MAX_MODELS_PER_NODE.get(settings);
229233
clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_MAX_MODELS_PER_NODE, it -> maxModelPerNode = it);

plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,8 @@ public Collection<Object> createComponents(
511511
mlTaskManager,
512512
modelCacheHelper,
513513
mlEngine,
514-
nodeHelper
514+
nodeHelper,
515+
mlFeatureEnabledSetting
515516
);
516517
mlInputDatasetHandler = new MLInputDatasetHandler(client);
517518
modelAccessControlHelper = new ModelAccessControlHelper(clusterService, settings);

plugin/src/test/java/org/opensearch/ml/model/MLModelManagerTests.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
import org.opensearch.ml.engine.encryptor.EncryptorImpl;
123123
import org.opensearch.ml.engine.indices.MLIndicesHandler;
124124
import org.opensearch.ml.sdkclient.SdkClientFactory;
125+
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
125126
import org.opensearch.ml.stats.ActionName;
126127
import org.opensearch.ml.stats.MLActionLevelStat;
127128
import org.opensearch.ml.stats.MLNodeLevelStat;
@@ -208,6 +209,8 @@ public class MLModelManagerTests extends OpenSearchTestCase {
208209

209210
@Mock
210211
private MLTask pretrainedMLTask;
212+
@Mock
213+
MLFeatureEnabledSetting mlFeatureEnabledSetting;
211214

212215
@Before
213216
public void setup() throws URISyntaxException, IOException {
@@ -301,7 +304,8 @@ public void setup() throws URISyntaxException, IOException {
301304
mlTaskManager,
302305
modelCacheHelper,
303306
mlEngine,
304-
nodeHelper
307+
nodeHelper,
308+
mlFeatureEnabledSetting
305309
)
306310
);
307311

0 commit comments

Comments
 (0)