Removing unused ML parameters (#34159)

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java

@@ -168,7 +168,6 @@ import org.elasticsearch.xpack.ml.job.categorization.MlClassicTokenizerFactory;
 import org.elasticsearch.xpack.ml.job.persistence.JobDataCountsPersister;
 import org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister;
 import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
-import org.elasticsearch.xpack.ml.job.process.DataCountsReporter;
 import org.elasticsearch.xpack.ml.job.process.NativeController;
 import org.elasticsearch.xpack.ml.job.process.NativeControllerHolder;
 import org.elasticsearch.xpack.ml.job.process.autodetect.AutodetectBuilder;
@@ -293,10 +292,6 @@ public class MachineLearning extends Plugin implements ActionPlugin, AnalysisPlu
                         AutodetectBuilder.DONT_PERSIST_MODEL_STATE_SETTING,
                         AutodetectBuilder.MAX_ANOMALY_RECORDS_SETTING,
                         AutodetectBuilder.MAX_ANOMALY_RECORDS_SETTING_DYNAMIC,
-                        DataCountsReporter.ACCEPTABLE_PERCENTAGE_DATE_PARSE_ERRORS_SETTING,
-                        DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING,
-                        DataCountsReporter.ACCEPTABLE_PERCENTAGE_OUT_OF_ORDER_ERRORS_SETTING,
-                        DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING,
                         AutodetectProcessManager.MAX_RUNNING_JOBS_PER_NODE,
                         AutodetectProcessManager.MAX_OPEN_JOBS_PER_NODE,
                         AutodetectProcessManager.MIN_DISK_SPACE_OFF_HEAP));
@@ -405,7 +400,7 @@ public class MachineLearning extends Plugin implements ActionPlugin, AnalysisPlu
                 threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME));
         AutodetectProcessManager autodetectProcessManager = new AutodetectProcessManager(env, settings, client, threadPool,
                 jobManager, jobResultsProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
-                normalizerFactory, xContentRegistry, auditor, clusterService);
+                normalizerFactory, xContentRegistry, auditor);
         this.autodetectProcessManager.set(autodetectProcessManager);
         DatafeedJobBuilder datafeedJobBuilder = new DatafeedJobBuilder(client, jobResultsProvider, auditor, System::currentTimeMillis);
         DatafeedManager datafeedManager = new DatafeedManager(threadPool, client, clusterService, datafeedJobBuilder,

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/DataCountsReporter.java

@@ -6,10 +6,7 @@
 package org.elasticsearch.xpack.ml.job.process;
 
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.component.AbstractComponent;
-import org.elasticsearch.common.settings.Setting;
-import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.xpack.core.ml.job.config.Job;
 import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.DataCounts;
@@ -38,32 +35,6 @@ import java.util.function.Function;
  * function returns {@code true} the usage is logged.
  */
 public class DataCountsReporter extends AbstractComponent {
-    /**
-     * The max percentage of date parse errors allowed before
-     * an exception is thrown.
-     */
-    @Deprecated
-    public static final Setting<Integer> ACCEPTABLE_PERCENTAGE_DATE_PARSE_ERRORS_SETTING = Setting.intSetting("max.percent.date.errors", 25,
-            Property.NodeScope, Property.Deprecated);
-    public static final Setting<Integer> MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING = Setting.intSetting(
-        "xpack.ml.max_percent_date_errors",
-        ACCEPTABLE_PERCENTAGE_DATE_PARSE_ERRORS_SETTING,
-        0,
-        Property.Dynamic,
-        Property.NodeScope);
-    /**
-     * The max percentage of out of order records allowed before
-     * an exception is thrown.
-     */
-    @Deprecated
-    public static final Setting<Integer> ACCEPTABLE_PERCENTAGE_OUT_OF_ORDER_ERRORS_SETTING = Setting
-            .intSetting("max.percent.outoforder.errors", 25, Property.NodeScope, Property.Deprecated);
-    public static final Setting<Integer> MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING = Setting.intSetting(
-        "xpack.ml.max_percent_out_of_order_errors",
-        ACCEPTABLE_PERCENTAGE_OUT_OF_ORDER_ERRORS_SETTING,
-        0,
-        Property.Dynamic,
-        Property.NodeScope);
 
     private final Job job;
     private final JobDataCountsPersister dataCountsPersister;
@@ -77,15 +48,11 @@ public class DataCountsReporter extends AbstractComponent {
     private long logEvery = 1;
     private long logCount = 0;
 
-    private volatile int acceptablePercentDateParseErrors;
-    private volatile int acceptablePercentOutOfOrderErrors;
-
     private Function<Long, Boolean> reportingBoundaryFunction;
 
     private DataStreamDiagnostics diagnostics;
 
-    public DataCountsReporter(Settings settings, Job job, DataCounts counts, JobDataCountsPersister dataCountsPersister,
-                              ClusterService clusterService) {
+    public DataCountsReporter(Settings settings, Job job, DataCounts counts, JobDataCountsPersister dataCountsPersister) {
 
         super(settings);
 
@@ -96,12 +63,6 @@ public class DataCountsReporter extends AbstractComponent {
         incrementalRecordStats = new DataCounts(job.getId());
         diagnostics = new DataStreamDiagnostics(job, counts);
 
-        acceptablePercentDateParseErrors = MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING.get(settings);
-        acceptablePercentOutOfOrderErrors = MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING.get(settings);
-        clusterService.getClusterSettings()
-            .addSettingsUpdateConsumer(MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING, this::setAcceptablePercentDateParseErrors);
-        clusterService.getClusterSettings()
-            .addSettingsUpdateConsumer(MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING, this::setAcceptablePercentOutOfOrderErrors);
         reportingBoundaryFunction = this::reportEvery10000Records;
     }
 
@@ -257,14 +218,6 @@ public class DataCountsReporter extends AbstractComponent {
         return totalRecordStats.getInputFieldCount();
     }
 
-    public int getAcceptablePercentDateParseErrors() {
-        return acceptablePercentDateParseErrors;
-    }
-
-    public int getAcceptablePercentOutOfOrderErrors() {
-        return acceptablePercentOutOfOrderErrors;
-    }
-
     public void setAnalysedFieldsPerRecord(long value) {
         analyzedFieldsPerRecord = value;
     }
@@ -368,16 +321,4 @@ public class DataCountsReporter extends AbstractComponent {
         diagnostics.resetCounts();
     }
 
-    private void setAcceptablePercentDateParseErrors(int acceptablePercentDateParseErrors) {
-        logger.info("Changing [{}] from [{}] to [{}]", MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING.getKey(),
-            this.acceptablePercentDateParseErrors, acceptablePercentDateParseErrors);
-        this.acceptablePercentDateParseErrors = acceptablePercentDateParseErrors;
-    }
-
-    private void setAcceptablePercentOutOfOrderErrors(int acceptablePercentOutOfOrderErrors) {
-        logger.info("Changing [{}] from [{}] to [{}]", MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING.getKey(),
-            this.acceptablePercentOutOfOrderErrors, acceptablePercentOutOfOrderErrors);
-        this.acceptablePercentOutOfOrderErrors = acceptablePercentOutOfOrderErrors;
-    }
-
 }

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java

@@ -9,7 +9,6 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.CheckedConsumer;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractComponent;
@@ -131,13 +130,12 @@ public class AutodetectProcessManager extends AbstractComponent {
     private final NamedXContentRegistry xContentRegistry;
 
     private final Auditor auditor;
-    private final ClusterService clusterService;
 
     public AutodetectProcessManager(Environment environment, Settings settings, Client client, ThreadPool threadPool,
                                     JobManager jobManager, JobResultsProvider jobResultsProvider, JobResultsPersister jobResultsPersister,
                                     JobDataCountsPersister jobDataCountsPersister,
                                     AutodetectProcessFactory autodetectProcessFactory, NormalizerFactory normalizerFactory,
-                                    NamedXContentRegistry xContentRegistry, Auditor auditor, ClusterService clusterService) {
+                                    NamedXContentRegistry xContentRegistry, Auditor auditor) {
         super(settings);
         this.environment = environment;
         this.client = client;
@@ -152,7 +150,6 @@ public class AutodetectProcessManager extends AbstractComponent {
         this.jobDataCountsPersister = jobDataCountsPersister;
         this.auditor = auditor;
         this.nativeStorageProvider = new NativeStorageProvider(environment, MIN_DISK_SPACE_OFF_HEAP.get(settings));
-        this.clusterService = clusterService;
     }
 
     public void onNodeStartup() {
@@ -499,8 +496,7 @@ public class AutodetectProcessManager extends AbstractComponent {
         DataCountsReporter dataCountsReporter = new DataCountsReporter(settings,
             job,
             autodetectParams.dataCounts(),
-            jobDataCountsPersister,
-            clusterService);
+            jobDataCountsPersister);
         ScoresUpdater scoresUpdater = new ScoresUpdater(job, jobResultsProvider,
                 new JobRenormalizedResultsPersister(job.getId(), settings, client), normalizerFactory);
         ExecutorService renormalizerExecutorService = threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME);

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/CountingInputStreamTests.java

@@ -5,44 +5,18 @@
  */
 package org.elasticsearch.xpack.ml.job.process;
 
-import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.common.settings.ClusterSettings;
-import org.elasticsearch.common.settings.Setting;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.ESTestCase;
-import org.junit.Before;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.elasticsearch.mock.orig.Mockito.when;
-import static org.mockito.Mockito.mock;
 
 public class CountingInputStreamTests extends ESTestCase {
 
-    private ClusterService clusterService;
-
-    @Before
-    public void setUpMocks() {
-        Settings settings = Settings.builder().put(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING.getKey(), 10)
-            .put(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING.getKey(), 10)
-            .build();
-        Set<Setting<?>> setOfSettings = new HashSet<>();
-        setOfSettings.add(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING);
-        setOfSettings.add(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING);
-        ClusterSettings clusterSettings = new ClusterSettings(settings, setOfSettings);
-
-        clusterService = mock(ClusterService.class);
-        when(clusterService.getClusterSettings()).thenReturn(clusterSettings);
-    }
-
     public void testRead_OneByteAtATime() throws IOException {
 
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
 
         final String TEXT = "123";
         InputStream source = new ByteArrayInputStream(TEXT.getBytes(StandardCharsets.UTF_8));
@@ -56,7 +30,7 @@ public class CountingInputStreamTests extends ESTestCase {
     public void testRead_WithBuffer() throws IOException {
         final String TEXT = "To the man who only has a hammer, everything he encounters begins to look like a nail.";
 
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
 
         InputStream source = new ByteArrayInputStream(TEXT.getBytes(StandardCharsets.UTF_8));
 
@@ -70,7 +44,7 @@ public class CountingInputStreamTests extends ESTestCase {
     public void testRead_WithTinyBuffer() throws IOException {
         final String TEXT = "To the man who only has a hammer, everything he encounters begins to look like a nail.";
 
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
 
         InputStream source = new ByteArrayInputStream(TEXT.getBytes(StandardCharsets.UTF_8));
 
@@ -83,7 +57,7 @@ public class CountingInputStreamTests extends ESTestCase {
 
     public void testRead_WithResets() throws IOException {
 
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
 
         final String TEXT = "To the man who only has a hammer, everything he encounters begins to look like a nail.";
         InputStream source = new ByteArrayInputStream(TEXT.getBytes(StandardCharsets.UTF_8));

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/DataCountsReporterTests.java

@@ -6,9 +6,6 @@
 package org.elasticsearch.xpack.ml.job.process;
 
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.common.settings.ClusterSettings;
-import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.env.Environment;
@@ -25,33 +22,24 @@ import org.mockito.Mockito;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.mock.orig.Mockito.when;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 public class DataCountsReporterTests extends ESTestCase {
-    private static final int MAX_PERCENT_DATE_PARSE_ERRORS = 40;
-    private static final int MAX_PERCENT_OUT_OF_ORDER_ERRORS = 30;
 
     private Job job;
     private JobDataCountsPersister jobDataCountsPersister;
     private Settings settings;
     private TimeValue bucketSpan = TimeValue.timeValueSeconds(300);
-    private ClusterService clusterService;
 
     @Before
     public void setUpMocks() {
         settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
-                .put(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING.getKey(), MAX_PERCENT_DATE_PARSE_ERRORS)
-                .put(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING.getKey(), MAX_PERCENT_OUT_OF_ORDER_ERRORS)
                 .build();
 
         AnalysisConfig.Builder acBuilder = new AnalysisConfig.Builder(Arrays.asList(new Detector.Builder("metric", "field").build()));
@@ -60,14 +48,6 @@ public class DataCountsReporterTests extends ESTestCase {
         acBuilder.setDetectors(Arrays.asList(new Detector.Builder("metric", "field").build()));
 
 
-        Set<Setting<?>> setOfSettings = new HashSet<>();
-        setOfSettings.add(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING);
-        setOfSettings.add(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING);
-        ClusterSettings clusterSettings = new ClusterSettings(settings, setOfSettings);
-
-        clusterService = mock(ClusterService.class);
-        when(clusterService.getClusterSettings()).thenReturn(clusterSettings);
-
         Job.Builder builder = new Job.Builder("sr");
         builder.setAnalysisConfig(acBuilder);
         builder.setDataDescription(new DataDescription.Builder());
@@ -76,16 +56,9 @@ public class DataCountsReporterTests extends ESTestCase {
         jobDataCountsPersister = Mockito.mock(JobDataCountsPersister.class);
     }
 
-    public void testSettingAcceptablePercentages() throws IOException {
-        DataCountsReporter dataCountsReporter = new DataCountsReporter(settings, job, new DataCounts(job.getId()),
-                jobDataCountsPersister, clusterService);
-        assertEquals(dataCountsReporter.getAcceptablePercentDateParseErrors(), MAX_PERCENT_DATE_PARSE_ERRORS);
-        assertEquals(dataCountsReporter.getAcceptablePercentOutOfOrderErrors(), MAX_PERCENT_OUT_OF_ORDER_ERRORS);
-    }
-
     public void testSimpleConstructor() throws Exception {
         DataCountsReporter dataCountsReporter = new DataCountsReporter(settings, job, new DataCounts(job.getId()),
-                jobDataCountsPersister, clusterService);
+                jobDataCountsPersister);
         DataCounts stats = dataCountsReporter.incrementalStats();
         assertNotNull(stats);
         assertAllCountFieldsEqualZero(stats);
@@ -96,7 +69,7 @@ public class DataCountsReporterTests extends ESTestCase {
                 new Date(), new Date(), new Date(), new Date(), new Date());
 
         DataCountsReporter dataCountsReporter =
-                new DataCountsReporter(settings, job, counts, jobDataCountsPersister, clusterService);
+                new DataCountsReporter(settings, job, counts, jobDataCountsPersister);
         DataCounts stats = dataCountsReporter.incrementalStats();
         assertNotNull(stats);
         assertAllCountFieldsEqualZero(stats);
@@ -114,7 +87,7 @@ public class DataCountsReporterTests extends ESTestCase {
 
     public void testResetIncrementalCounts() throws Exception {
         DataCountsReporter dataCountsReporter = new DataCountsReporter(settings, job, new DataCounts(job.getId()),
-                jobDataCountsPersister, clusterService);
+                jobDataCountsPersister);
         DataCounts stats = dataCountsReporter.incrementalStats();
         assertNotNull(stats);
         assertAllCountFieldsEqualZero(stats);
@@ -167,7 +140,7 @@ public class DataCountsReporterTests extends ESTestCase {
 
     public void testReportLatestTimeIncrementalStats() throws IOException {
         DataCountsReporter dataCountsReporter = new DataCountsReporter(settings, job, new DataCounts(job.getId()),
-                jobDataCountsPersister, clusterService);
+                jobDataCountsPersister);
         dataCountsReporter.startNewIncrementalCount();
         dataCountsReporter.reportLatestTimeIncrementalStats(5001L);
         assertEquals(5001L, dataCountsReporter.incrementalStats().getLatestRecordTimeStamp().getTime());
@@ -175,7 +148,7 @@ public class DataCountsReporterTests extends ESTestCase {
 
     public void testReportRecordsWritten() {
         DataCountsReporter dataCountsReporter = new DataCountsReporter(settings, job, new DataCounts(job.getId()),
-                jobDataCountsPersister, clusterService);
+                jobDataCountsPersister);
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
 
         dataCountsReporter.reportRecordWritten(5, 2000);
@@ -199,7 +172,7 @@ public class DataCountsReporterTests extends ESTestCase {
     }
 
     public void testReportRecordsWritten_Given9999Records() {
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
 
         for (int i = 1; i <= 9999; i++) {
@@ -216,7 +189,7 @@ public class DataCountsReporterTests extends ESTestCase {
     }
 
     public void testReportRecordsWritten_Given30000Records() {
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
 
         for (int i = 1; i <= 30001; i++) {
@@ -233,7 +206,7 @@ public class DataCountsReporterTests extends ESTestCase {
     }
 
     public void testReportRecordsWritten_Given100_000Records() {
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
 
         for (int i = 1; i <= 100000; i++) {
@@ -250,7 +223,7 @@ public class DataCountsReporterTests extends ESTestCase {
     }
 
     public void testReportRecordsWritten_Given1_000_000Records() {
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
 
         for (int i = 1; i <= 1_000_000; i++) {
@@ -267,7 +240,7 @@ public class DataCountsReporterTests extends ESTestCase {
     }
 
     public void testReportRecordsWritten_Given2_000_000Records() {
-        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter(clusterService);
+        DummyDataCountsReporter dataCountsReporter = new DummyDataCountsReporter();
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
 
         for (int i = 1; i <= 2_000_000; i++) {
@@ -286,7 +259,7 @@ public class DataCountsReporterTests extends ESTestCase {
 
     public void testFinishReporting() {
         DataCountsReporter dataCountsReporter = new DataCountsReporter(settings, job, new DataCounts(job.getId()),
-                jobDataCountsPersister, clusterService);
+                jobDataCountsPersister);
 
         dataCountsReporter.setAnalysedFieldsPerRecord(3);
         Date now = new Date();

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/DummyDataCountsReporter.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.job.process;
 
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.xpack.core.ml.job.config.AnalysisConfig;
@@ -27,9 +26,9 @@ class DummyDataCountsReporter extends DataCountsReporter {
 
     int logStatusCallCount = 0;
 
-    DummyDataCountsReporter(ClusterService clusterService) {
+    DummyDataCountsReporter() {
         super(Settings.EMPTY, createJob(), new DataCounts("DummyJobId"),
-                mock(JobDataCountsPersister.class), clusterService);
+                mock(JobDataCountsPersister.class));
     }
 
     /**

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManagerTests.java

@@ -8,10 +8,7 @@ package org.elasticsearch.xpack.ml.job.process.autodetect;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.CheckedConsumer;
-import org.elasticsearch.common.settings.ClusterSettings;
-import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
@@ -44,7 +41,6 @@ import org.elasticsearch.xpack.ml.job.categorization.CategorizationAnalyzerTests
 import org.elasticsearch.xpack.ml.job.persistence.JobDataCountsPersister;
 import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
 import org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister;
-import org.elasticsearch.xpack.ml.job.process.DataCountsReporter;
 import org.elasticsearch.xpack.ml.job.process.autodetect.params.AutodetectParams;
 import org.elasticsearch.xpack.ml.job.process.autodetect.params.DataLoadParams;
 import org.elasticsearch.xpack.ml.job.process.autodetect.params.FlushJobParams;
@@ -110,7 +106,6 @@ public class AutodetectProcessManagerTests extends ESTestCase {
     private JobDataCountsPersister jobDataCountsPersister;
     private NormalizerFactory normalizerFactory;
     private Auditor auditor;
-    private ClusterService clusterService;
 
     private DataCounts dataCounts = new DataCounts("foo");
     private ModelSizeStats modelSizeStats = new ModelSizeStats.Builder("foo").build();
@@ -132,14 +127,6 @@ public class AutodetectProcessManagerTests extends ESTestCase {
         auditor = mock(Auditor.class);
 
 
-        Set<Setting<?>> setOfSettings = new HashSet<>();
-        setOfSettings.add(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_DATE_PARSE_ERRORS_SETTING);
-        setOfSettings.add(DataCountsReporter.MAX_ACCEPTABLE_PERCENT_OF_OUT_OF_ORDER_ERRORS_SETTING);
-        ClusterSettings clusterSettings = new ClusterSettings(settings, setOfSettings);
-
-        clusterService = mock(ClusterService.class);
-        when(clusterService.getClusterSettings()).thenReturn(clusterSettings);
-
         when(jobManager.getJobOrThrowIfUnknown("foo")).thenReturn(createJobDetails("foo"));
         doAnswer(invocationOnMock -> {
             @SuppressWarnings("unchecked")
@@ -242,7 +229,7 @@ public class AutodetectProcessManagerTests extends ESTestCase {
         settings.put(AutodetectProcessManager.MAX_OPEN_JOBS_PER_NODE.getKey(), 3);
         AutodetectProcessManager manager = spy(new AutodetectProcessManager(environment, settings.build(), client, threadPool,
                 jobManager, jobResultsProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
-                normalizerFactory, new NamedXContentRegistry(Collections.emptyList()), auditor, clusterService));
+                normalizerFactory, new NamedXContentRegistry(Collections.emptyList()), auditor));
         doReturn(executorService).when(manager).createAutodetectExecutorService(any());
 
         doAnswer(invocationOnMock -> {
@@ -597,7 +584,7 @@ public class AutodetectProcessManagerTests extends ESTestCase {
                 (j, autodetectParams, e, onProcessCrash) -> autodetectProcess;
         AutodetectProcessManager manager = new AutodetectProcessManager(environment, Settings.EMPTY,
                 client, threadPool, jobManager, jobResultsProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
-                normalizerFactory, new NamedXContentRegistry(Collections.emptyList()), auditor, clusterService);
+                normalizerFactory, new NamedXContentRegistry(Collections.emptyList()), auditor);
 
         JobTask jobTask = mock(JobTask.class);
         when(jobTask.getJobId()).thenReturn("my_id");
@@ -670,7 +657,7 @@ public class AutodetectProcessManagerTests extends ESTestCase {
                 (j, autodetectParams, e, onProcessCrash) -> autodetectProcess;
         return new AutodetectProcessManager(environment, Settings.EMPTY, client, threadPool, jobManager,
                 jobResultsProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
-                normalizerFactory, new NamedXContentRegistry(Collections.emptyList()), auditor, clusterService);
+                normalizerFactory, new NamedXContentRegistry(Collections.emptyList()), auditor);
     }
 
     private AutodetectParams buildAutodetectParams() {
@@ -696,7 +683,7 @@ public class AutodetectProcessManagerTests extends ESTestCase {
         AutodetectProcessManager manager = new AutodetectProcessManager(environment, Settings.EMPTY,
                 client, threadPool, jobManager, jobResultsProvider, jobResultsPersister, jobDataCountsPersister,
                 autodetectProcessFactory, normalizerFactory,
-                new NamedXContentRegistry(Collections.emptyList()), auditor, clusterService);
+                new NamedXContentRegistry(Collections.emptyList()), auditor);
         manager = spy(manager);
         doReturn(communicator).when(manager).create(any(), eq(buildAutodetectParams()), any());
         return manager;