Skip to content

Do not stash environment in machine learning #54371

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

Merged
merged 1 commit into from
Mar 28, 2020
Merged

Do not stash environment in machine learning #54371

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: 2 additions & 4 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ public Set<DiscoveryNodeRole> getRoles() {
private static final Logger logger = LogManager.getLogger(MachineLearning.class);

private final Settings settings;
private final Environment env;
private final boolean enabled;

private final SetOnce<AutodetectProcessManager> autodetectProcessManager = new SetOnce<>();
Expand All @@ -431,7 +430,6 @@ public Set<DiscoveryNodeRole> getRoles() {
public MachineLearning(Settings settings, Path configPath) {
this.settings = settings;
this.enabled = XPackSettings.MACHINE_LEARNING_ENABLED.get(settings);
this.env = new Environment(settings, configPath);
}

protected XPackLicenseState getLicenseState() { return XPackPlugin.getSharedLicenseState(); }
Expand Down Expand Up @@ -550,7 +548,7 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
JobConfigProvider jobConfigProvider = new JobConfigProvider(client, xContentRegistry);
DatafeedConfigProvider datafeedConfigProvider = new DatafeedConfigProvider(client, xContentRegistry);
UpdateJobProcessNotifier notifier = new UpdateJobProcessNotifier(client, clusterService, threadPool);
JobManager jobManager = new JobManager(env,
JobManager jobManager = new JobManager(environment,
settings,
jobResultsProvider,
jobResultsPersister,
Expand Down Expand Up @@ -613,7 +611,7 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
}
NormalizerFactory normalizerFactory = new NormalizerFactory(normalizerProcessFactory,
threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME));
AutodetectProcessManager autodetectProcessManager = new AutodetectProcessManager(env, settings, client, threadPool,
AutodetectProcessManager autodetectProcessManager = new AutodetectProcessManager(environment, settings, client, threadPool,
xContentRegistry, anomalyDetectionAuditor, clusterService, jobManager, jobResultsProvider, jobResultsPersister,
jobDataCountsPersister, autodetectProcessFactory, normalizerFactory, nativeStorageProvider, indexNameExpressionResolver);
this.autodetectProcessManager.set(autodetectProcessManager);
Expand Down