fix unmappable character for encoding US-ASCII (#738)

* fix unmappable character for encoding US-ASCII Signed-off-by: Yaliang Wu <[email protected]> * Revert "the dev of [FEATURE]Auto reload model when cluster rebooted/node rejoin (#711)" This reverts commit 7a51dcc. Signed-off-by: Yaliang Wu <[email protected]> --------- Signed-off-by: Yaliang Wu <[email protected]>
opensearch-project · Feb 21, 2023 · 407d501 · 407d501
1 parent 7ae4192
commit 407d501
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 1,501 deletions.
diff --git a/common/src/main/java/org/opensearch/ml/common/CommonValue.java b/common/src/main/java/org/opensearch/ml/common/CommonValue.java
@@ -32,10 +32,6 @@ public class CommonValue {
     public static final String ML_TASK_INDEX = ".plugins-ml-task";
     public static final Integer ML_MODEL_INDEX_SCHEMA_VERSION = 3;
     public static final Integer ML_TASK_INDEX_SCHEMA_VERSION = 1;
-
-    public static final String ML_MODEL_RELOAD_INDEX = ".plugins-ml-model-reload";
-    public static final String NODE_ID_FIELD = "node_id";
-    public static final String MODEL_LOAD_RETRY_TIMES_FIELD = "retry_times";
     public static final String USER_FIELD_MAPPING = "      \""
             + CommonValue.USER
             + "\": {\n"

diff --git a/...thms/src/main/java/org/opensearch/ml/engine/algorithms/regression/LogisticRegression.java b/...thms/src/main/java/org/opensearch/ml/engine/algorithms/regression/LogisticRegression.java
@@ -104,7 +104,7 @@ private void validateParameters() {
             throw new IllegalArgumentException("MiniBatchSize should not be negative.");
         }
 
-        // loggingInterval – Log the loss after this many iterations. If -1 don't log anything.
+        // loggingInterval: Log the loss after this many iterations. If -1 don't log anything.
         if (parameters.getLoggingInterval() != null && parameters.getLoggingInterval() < -1) {
             throw new IllegalArgumentException("Invalid Logging intervals");
         }

diff --git a/plugin/src/main/java/org/opensearch/ml/model/MLModelAutoReloader.java b/plugin/src/main/java/org/opensearch/ml/model/MLModelAutoReloader.java
diff --git a/plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java b/plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java
@@ -99,7 +99,6 @@
 import org.opensearch.ml.engine.algorithms.sample.LocalSampleCalculator;
 import org.opensearch.ml.indices.MLIndicesHandler;
 import org.opensearch.ml.indices.MLInputDatasetHandler;
-import org.opensearch.ml.model.MLModelAutoReloader;
 import org.opensearch.ml.model.MLModelCacheHelper;
 import org.opensearch.ml.model.MLModelManager;
 import org.opensearch.ml.rest.RestMLCreateModelMetaAction;
@@ -176,8 +175,6 @@ public class MachineLearningPlugin extends Plugin implements ActionPlugin {
     private MLModelChunkUploader mlModelChunkUploader;
     private MLEngine mlEngine;
 
-    private MLModelAutoReloader mlModelAutoReloader;
-
     private Client client;
     private ClusterService clusterService;
     private ThreadPool threadPool;
@@ -355,9 +352,6 @@ public Collection<Object> createComponents(
             mlIndicesHandler
         );
 
-        mlModelAutoReloader = new MLModelAutoReloader(clusterService, threadPool, client, xContentRegistry, nodeHelper, settings);
-        mlModelAutoReloader.autoReloadModel();
-
         return ImmutableList
             .of(
                 mlEngine,
@@ -379,8 +373,7 @@ public Collection<Object> createComponents(
                 modelHelper,
                 mlCommonsClusterEventListener,
                 clusterManagerEventListener,
-                mlCircuitBreakerService,
-                mlModelAutoReloader
+                mlCircuitBreakerService
             );
     }
 
@@ -520,9 +513,7 @@ public List<Setting<?>> getSettings() {
                 MLCommonsSettings.ML_COMMONS_MAX_ML_TASK_PER_NODE,
                 MLCommonsSettings.ML_COMMONS_MAX_LOAD_MODEL_TASKS_PER_NODE,
                 MLCommonsSettings.ML_COMMONS_TRUSTED_URL_REGEX,
-                MLCommonsSettings.ML_COMMONS_NATIVE_MEM_THRESHOLD,
-                MLCommonsSettings.ML_COMMONS_MODEL_AUTO_RELOAD_ENABLE,
-                MLCommonsSettings.ML_MODEL_RELOAD_MAX_RETRY_TIMES
+                MLCommonsSettings.ML_COMMONS_NATIVE_MEM_THRESHOLD
             );
         return settings;
     }