Skip to content

Commit 6086aac

Browse files
authored
Revert "[8.15] [ML] Downloaded and write model parts using multiple streams (#112869)" (#113017)
This reverts commit f48a1c6.
1 parent 868699c commit 6086aac

File tree

13 files changed

+178
-902
lines changed

13 files changed

+178
-902
lines changed

docs/changelog/111684.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/112869.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/notifications/Level.java

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,9 @@
99
import java.util.Locale;
1010

1111
public enum Level {
12-
INFO {
13-
public org.apache.logging.log4j.Level log4jLevel() {
14-
return org.apache.logging.log4j.Level.INFO;
15-
}
16-
},
17-
WARNING {
18-
public org.apache.logging.log4j.Level log4jLevel() {
19-
return org.apache.logging.log4j.Level.WARN;
20-
}
21-
},
22-
ERROR {
23-
public org.apache.logging.log4j.Level log4jLevel() {
24-
return org.apache.logging.log4j.Level.ERROR;
25-
}
26-
};
27-
28-
public abstract org.apache.logging.log4j.Level log4jLevel();
12+
INFO,
13+
WARNING,
14+
ERROR;
2915

3016
/**
3117
* Case-insensitive from string method.

x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/MachineLearningPackageLoader.java

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@
1515
import org.elasticsearch.common.Strings;
1616
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1717
import org.elasticsearch.common.settings.Setting;
18-
import org.elasticsearch.common.settings.Settings;
19-
import org.elasticsearch.common.util.concurrent.EsExecutors;
2018
import org.elasticsearch.plugins.ActionPlugin;
2119
import org.elasticsearch.plugins.Plugin;
2220
import org.elasticsearch.tasks.Task;
23-
import org.elasticsearch.threadpool.ExecutorBuilder;
24-
import org.elasticsearch.threadpool.FixedExecutorBuilder;
2521
import org.elasticsearch.xpack.core.ml.packageloader.action.GetTrainedModelPackageConfigAction;
2622
import org.elasticsearch.xpack.core.ml.packageloader.action.LoadTrainedModelPackageAction;
2723
import org.elasticsearch.xpack.ml.packageloader.action.ModelDownloadTask;
28-
import org.elasticsearch.xpack.ml.packageloader.action.ModelImporter;
2924
import org.elasticsearch.xpack.ml.packageloader.action.TransportGetTrainedModelPackageConfigAction;
3025
import org.elasticsearch.xpack.ml.packageloader.action.TransportLoadTrainedModelPackage;
3126

@@ -49,15 +44,16 @@ public class MachineLearningPackageLoader extends Plugin implements ActionPlugin
4944
Setting.Property.Dynamic
5045
);
5146

47+
// re-using thread pool setup by the ml plugin
48+
public static final String UTILITY_THREAD_POOL_NAME = "ml_utility";
49+
5250
// This link will be invalid for serverless, but serverless will never be
5351
// air-gapped, so this message should never be needed.
5452
private static final String MODEL_REPOSITORY_DOCUMENTATION_LINK = format(
5553
"https://www.elastic.co/guide/en/machine-learning/%s/ml-nlp-elser.html#air-gapped-install",
5654
Build.current().version().replaceFirst("^(\\d+\\.\\d+).*", "$1")
5755
);
5856

59-
public static final String MODEL_DOWNLOAD_THREADPOOL_NAME = "model_download";
60-
6157
public MachineLearningPackageLoader() {}
6258

6359
@Override
@@ -85,24 +81,6 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
8581
);
8682
}
8783

88-
@Override
89-
public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) {
90-
return List.of(modelDownloadExecutor(settings));
91-
}
92-
93-
public static FixedExecutorBuilder modelDownloadExecutor(Settings settings) {
94-
// Threadpool with a fixed number of threads for
95-
// downloading the model definition files
96-
return new FixedExecutorBuilder(
97-
settings,
98-
MODEL_DOWNLOAD_THREADPOOL_NAME,
99-
ModelImporter.NUMBER_OF_STREAMS,
100-
-1, // unbounded queue size
101-
"xpack.ml.model_download_thread_pool",
102-
EsExecutors.TaskTrackingConfig.DO_NOT_TRACK
103-
);
104-
}
105-
10684
@Override
10785
public List<BootstrapCheck> getBootstrapChecks() {
10886
return List.of(new BootstrapCheck() {

0 commit comments

Comments
 (0)