From b2195fb226ebe02140563b9dcb06371f375f71d9 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 5 Sep 2018 14:55:36 +0200 Subject: [PATCH] adapt to upstream changes --- x-pack/plugin/ml-feature-index-builder/build.gradle | 2 +- .../xpack/ml/featureindexbuilder/FeatureIndexBuilder.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/ml-feature-index-builder/build.gradle b/x-pack/plugin/ml-feature-index-builder/build.gradle index 30d4cd8a60262..b4706e29487c5 100644 --- a/x-pack/plugin/ml-feature-index-builder/build.gradle +++ b/x-pack/plugin/ml-feature-index-builder/build.gradle @@ -16,7 +16,7 @@ compileTestJava.options.compilerArgs << "-Xlint:-rawtypes" dependencies { compileOnly "org.elasticsearch:elasticsearch:${version}" - compileOnly project(path: xpackModule('core'), configuration: 'shadow') + compileOnly project(path: xpackModule('core'), configuration: 'default') testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') } diff --git a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/FeatureIndexBuilder.java b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/FeatureIndexBuilder.java index e209bd5e34038..bd9bcd751be6a 100644 --- a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/FeatureIndexBuilder.java +++ b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/FeatureIndexBuilder.java @@ -100,13 +100,13 @@ public List getRestHandlers(final Settings settings, final RestCont if (!enabled) { return emptyList(); } - + return Arrays.asList( new ActionHandler<>(PutFeatureIndexBuilderJobAction.INSTANCE, TransportPutFeatureIndexBuilderJobAction.class), new ActionHandler<>(StartFeatureIndexBuilderJobAction.INSTANCE, TransportStartFeatureIndexBuilderJobAction.class) ); } - + @Override public List> getExecutorBuilders(Settings settings) { if (false == enabled) { @@ -126,7 +126,7 @@ public List> getPersistentTasksExecutor(ClusterServic return emptyList(); } - SchedulerEngine schedulerEngine = new SchedulerEngine(Clock.systemUTC()); + SchedulerEngine schedulerEngine = new SchedulerEngine(settings, Clock.systemUTC()); return Collections.singletonList(new FeatureIndexBuilderJobTask.FeatureIndexBuilderJobPersistentTasksExecutor(settings, client, schedulerEngine, threadPool)); }