diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java index b19962c7307..d1425f25286 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java @@ -62,7 +62,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class AutodetectResultProcessorIT extends ESSingleNodeTestCase { - private static final String JOB_ID = "foo"; + private static final String JOB_ID = "autodetect-result-processor-it-job"; private Renormalizer renormalizer; private JobResultsPersister jobResultsPersister; diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java index 0448f26fae0..e6c23cffee2 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java @@ -47,7 +47,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { internalCluster().ensureAtLeastNumDataNodes(4); ensureStableCluster(4); - Job.Builder job = createJob("job_id"); + Job.Builder job = createJob("fail-over-basics-job"); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).actionGet(); assertTrue(putJobResponse.isAcknowledged()); @@ -83,7 +83,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { internalCluster().ensureAtLeastNumDataNodes(4); ensureStableCluster(4); - Job.Builder job = createScheduledJob("job_id"); + Job.Builder job = createScheduledJob("fail-over-basics_with-data-feeder-job"); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).actionGet(); assertTrue(putJobResponse.isAcknowledged()); @@ -157,7 +157,8 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { } ensureStableCluster(3); - Job.Builder job = createJob("job_id"); + String jobId = "dedicated-ml-node-job"; + Job.Builder job = createJob(jobId); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).actionGet(); assertTrue(putJobResponse.isAcknowledged()); @@ -167,7 +168,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { assertBusy(() -> { ClusterState clusterState = client().admin().cluster().prepareState().get().getState(); PersistentTasksCustomMetaData tasks = clusterState.getMetaData().custom(PersistentTasksCustomMetaData.TYPE); - PersistentTask task = tasks.getTask(MlMetadata.jobTaskId("job_id")); + PersistentTask task = tasks.getTask(MlMetadata.jobTaskId(jobId)); DiscoveryNode node = clusterState.nodes().resolveNode(task.getExecutorNode()); Map expectedNodeAttr = new HashMap<>(); @@ -184,7 +185,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { assertBusy(() -> { // job should get and remain in a failed state and // the status remains to be opened as from ml we didn't had the chance to set the status to failed: - assertJobTask("job_id", JobState.OPENED, false); + assertJobTask(jobId, JobState.OPENED, false); }); logger.info("start ml node"); @@ -192,7 +193,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { ensureStableCluster(3); assertBusy(() -> { // job should be re-opened: - assertJobTask("job_id", JobState.OPENED, true); + assertJobTask(jobId, JobState.OPENED, true); }); } @@ -322,7 +323,8 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { .put(MachineLearning.ML_ENABLED.getKey(), true)); ensureStableCluster(2); - Job.Builder job = createFareQuoteJob("job_id"); + String jobId = "ml-indices-not-available-job"; + Job.Builder job = createFareQuoteJob(jobId); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).actionGet(); assertTrue(putJobResponse.isAcknowledged()); @@ -330,7 +332,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { OpenJobAction.Request openJobRequest = new OpenJobAction.Request(job.getId()); client().execute(OpenJobAction.INSTANCE, openJobRequest).actionGet(); - PostDataAction.Request postDataRequest = new PostDataAction.Request("job_id"); + PostDataAction.Request postDataRequest = new PostDataAction.Request(jobId); postDataRequest.setContent(new BytesArray( "{\"airline\":\"AAL\",\"responsetime\":\"132.2046\",\"sourcetype\":\"farequote\",\"time\":\"1403481600\"}\n" + "{\"airline\":\"JZA\",\"responsetime\":\"990.4628\",\"sourcetype\":\"farequote\",\"time\":\"1403481700\"}" @@ -338,7 +340,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { PostDataAction.Response response = client().execute(PostDataAction.INSTANCE, postDataRequest).actionGet(); assertEquals(2, response.getDataCounts().getProcessedRecordCount()); - CloseJobAction.Request closeJobRequest = new CloseJobAction.Request("job_id"); + CloseJobAction.Request closeJobRequest = new CloseJobAction.Request(jobId); client().execute(CloseJobAction.INSTANCE, closeJobRequest).actionGet(); assertBusy(() -> { ClusterState clusterState = client().admin().cluster().prepareState().get().getState(); @@ -362,7 +364,7 @@ public class BasicDistributedJobsIT extends BaseMlIntegTestCase { ensureStableCluster(2, nonMlNode); ensureYellow(); // at least the primary shards of the indices a job uses should be started client().execute(OpenJobAction.INSTANCE, openJobRequest).actionGet(); - assertBusy(() -> assertJobTask("job_id", JobState.OPENED, true)); + assertBusy(() -> assertJobTask(jobId, JobState.OPENED, true)); } private void assertJobTask(String jobId, JobState expectedState, boolean hasExecutorNode) { diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java index 1efafdcc841..18e70e13d07 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java @@ -43,8 +43,8 @@ public class MlDistributedFailureIT extends BaseMlIntegTestCase { public void testFailOver() throws Exception { internalCluster().ensureAtLeastNumDataNodes(3); ensureStableClusterOnAllNodes(3); - run(() -> { - GetJobsStatsAction.Request request = new GetJobsStatsAction.Request("job_id"); + run("fail-over-job", () -> { + GetJobsStatsAction.Request request = new GetJobsStatsAction.Request("fail-over-job"); GetJobsStatsAction.Response response = client().execute(GetJobsStatsAction.INSTANCE, request).actionGet(); DiscoveryNode discoveryNode = response.getResponse().results().get(0).getNode(); internalCluster().stopRandomNode(settings -> discoveryNode.getName().equals(settings.get("node.name"))); @@ -67,7 +67,7 @@ public class MlDistributedFailureIT extends BaseMlIntegTestCase { .put("node.master", false) .build()); ensureStableClusterOnAllNodes(2); - run(() -> { + run("lose-dedicated-master-node-job", () -> { logger.info("Stopping dedicated master node"); internalCluster().stopRandomNode(settings -> settings.getAsBoolean("node.master", false)); assertBusy(() -> { @@ -88,14 +88,14 @@ public class MlDistributedFailureIT extends BaseMlIntegTestCase { public void testFullClusterRestart() throws Exception { internalCluster().ensureAtLeastNumDataNodes(3); ensureStableClusterOnAllNodes(3); - run(() -> { + run("full-cluster-restart-job", () -> { logger.info("Restarting all nodes"); internalCluster().fullRestart(); logger.info("Restarted all nodes"); }); } - private void run(CheckedRunnable disrupt) throws Exception { + private void run(String jobId, CheckedRunnable disrupt) throws Exception { client().admin().indices().prepareCreate("data") .addMapping("type", "time", "type=date") .get(); @@ -105,7 +105,7 @@ public class MlDistributedFailureIT extends BaseMlIntegTestCase { long twoWeeksAgo = weekAgo - 604800000; indexDocs(logger, "data", numDocs1, twoWeeksAgo, weekAgo); - Job.Builder job = createScheduledJob("job_id"); + Job.Builder job = createScheduledJob(jobId); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).actionGet(); assertTrue(putJobResponse.isAcknowledged()); @@ -142,7 +142,7 @@ public class MlDistributedFailureIT extends BaseMlIntegTestCase { assertFalse(task.needsReassignment(clusterState.nodes())); } - GetJobsStatsAction.Request jobStatsRequest = new GetJobsStatsAction.Request("job_id"); + GetJobsStatsAction.Request jobStatsRequest = new GetJobsStatsAction.Request(jobId); JobStats jobStats = client().execute(GetJobsStatsAction.INSTANCE, jobStatsRequest).actionGet() .getResponse().results().get(0); assertEquals(JobState.OPENED, jobStats.getState()); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java index f2917da1987..4659bd73c76 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java @@ -60,11 +60,11 @@ public class MlJobIT extends ESRestTestCase { "} } } }"; public void testPutJob_GivenFarequoteConfig() throws Exception { - Response response = createFarequoteJob(); + Response response = createFarequoteJob("given-farequote-config-job"); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); String responseAsString = responseEntityToString(response); - assertThat(responseAsString, containsString("\"job_id\":\"farequote\"")); + assertThat(responseAsString, containsString("\"job_id\":\"given-farequote-config-job\"")); } public void testGetJob_GivenNoSuchJob() throws Exception { @@ -76,18 +76,20 @@ public class MlJobIT extends ESRestTestCase { } public void testGetJob_GivenJobExists() throws Exception { - createFarequoteJob(); + createFarequoteJob("get-job_given-job-exists-job"); - Response response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/farequote/_stats"); + Response response = client().performRequest("get", + MachineLearning.BASE_PATH + "anomaly_detectors/get-job_given-job-exists-job/_stats"); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); String responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":1")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote\"")); + assertThat(responseAsString, containsString("\"job_id\":\"get-job_given-job-exists-job\"")); } public void testGetJobs_GivenSingleJob() throws Exception { - createFarequoteJob(); + String jobId = "get-jobs_given-single-job-job"; + createFarequoteJob(jobId); // Explicit _all Response response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/_all"); @@ -95,7 +97,7 @@ public class MlJobIT extends ESRestTestCase { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); String responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":1")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote\"")); + assertThat(responseAsString, containsString("\"job_id\":\"" + jobId + "\"")); // Implicit _all response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors"); @@ -103,13 +105,13 @@ public class MlJobIT extends ESRestTestCase { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":1")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote\"")); + assertThat(responseAsString, containsString("\"job_id\":\"" + jobId + "\"")); } public void testGetJobs_GivenMultipleJobs() throws Exception { - createFarequoteJob("farequote_1"); - createFarequoteJob("farequote_2"); - createFarequoteJob("farequote_3"); + createFarequoteJob("given-multiple-jobs-job-1"); + createFarequoteJob("given-multiple-jobs-job-2"); + createFarequoteJob("given-multiple-jobs-job-3"); // Explicit _all Response response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/_all"); @@ -117,9 +119,9 @@ public class MlJobIT extends ESRestTestCase { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); String responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":3")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote_1\"")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote_2\"")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote_3\"")); + assertThat(responseAsString, containsString("\"job_id\":\"given-multiple-jobs-job-1\"")); + assertThat(responseAsString, containsString("\"job_id\":\"given-multiple-jobs-job-2\"")); + assertThat(responseAsString, containsString("\"job_id\":\"given-multiple-jobs-job-3\"")); // Implicit _all response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors"); @@ -127,13 +129,9 @@ public class MlJobIT extends ESRestTestCase { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":3")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote_1\"")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote_2\"")); - assertThat(responseAsString, containsString("\"job_id\":\"farequote_3\"")); - } - - private Response createFarequoteJob() throws Exception { - return createFarequoteJob("farequote"); + assertThat(responseAsString, containsString("\"job_id\":\"given-multiple-jobs-job-1\"")); + assertThat(responseAsString, containsString("\"job_id\":\"given-multiple-jobs-job-2\"")); + assertThat(responseAsString, containsString("\"job_id\":\"given-multiple-jobs-job-3\"")); } private Response createFarequoteJob(String jobId) throws Exception { @@ -153,23 +151,27 @@ public class MlJobIT extends ESRestTestCase { params.put("start", "1200"); // inclusive params.put("end", "1400"); // exclusive + String jobId = "get-bucket-results-job"; + ResponseException e = expectThrows(ResponseException.class, - () -> client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/buckets", params)); + () -> client().performRequest("get", + MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/buckets", params)); assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(404)); - assertThat(e.getMessage(), containsString("No known job with id '1'")); + assertThat(e.getMessage(), containsString("No known job with id '" + jobId + "'")); - createFarequoteJob("1"); + createFarequoteJob(jobId); - addBucketResult("1", "1234", 1); - addBucketResult("1", "1235", 1); - addBucketResult("1", "1236", 1); - Response response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/buckets", params); + addBucketResult(jobId, "1234", 1); + addBucketResult(jobId, "1235", 1); + addBucketResult(jobId, "1236", 1); + Response response = client().performRequest("get", + MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/buckets", params); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); String responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":3")); params.put("end", "1235"); - response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/buckets", params); + response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/buckets", params); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":1")); @@ -180,10 +182,10 @@ public class MlJobIT extends ESRestTestCase { assertThat(e.getMessage(), containsString("No known job with id '2'")); e = expectThrows(ResponseException.class, () -> client().performRequest("get", - MachineLearning.BASE_PATH + "anomaly_detectors/1/results/buckets/1")); + MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/buckets/1")); assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(404)); - response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/buckets/1234"); + response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/buckets/1234"); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); responseAsString = responseEntityToString(response); assertThat(responseAsString, not(isEmptyString())); @@ -194,23 +196,26 @@ public class MlJobIT extends ESRestTestCase { params.put("start", "1200"); // inclusive params.put("end", "1400"); // exclusive + String jobId = "get-record-results-job"; ResponseException e = expectThrows(ResponseException.class, - () -> client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/records", params)); + () -> client().performRequest("get", + MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/records", params)); assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(404)); - assertThat(e.getMessage(), containsString("No known job with id '1'")); + assertThat(e.getMessage(), containsString("No known job with id '" + jobId + "'")); - createFarequoteJob("1"); + createFarequoteJob(jobId); - addRecordResult("1", "1234", 1, 1); - addRecordResult("1", "1235", 1, 2); - addRecordResult("1", "1236", 1, 3); - Response response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/records", params); + addRecordResult(jobId, "1234", 1, 1); + addRecordResult(jobId, "1235", 1, 2); + addRecordResult(jobId, "1236", 1, 3); + Response response = client().performRequest("get", + MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/records", params); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); String responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":3")); params.put("end", "1235"); - response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/1/results/records", params); + response = client().performRequest("get", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/results/records", params); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); responseAsString = responseEntityToString(response); assertThat(responseAsString, containsString("\"count\":1")); @@ -225,18 +230,19 @@ public class MlJobIT extends ESRestTestCase { String jobConfig = String.format(Locale.ROOT, jobTemplate, "index-1"); - Response response = client().performRequest("put", MachineLearning.BASE_PATH + "anomaly_detectors/repeated-id" , + String jobId = "cant-create-job-with-same-id-job"; + Response response = client().performRequest("put", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId , Collections.emptyMap(), new StringEntity(jobConfig, ContentType.APPLICATION_JSON)); assertEquals(200, response.getStatusLine().getStatusCode()); final String jobConfig2 = String.format(Locale.ROOT, jobTemplate, "index-2"); ResponseException e = expectThrows(ResponseException.class, - () ->client().performRequest("put", MachineLearning.BASE_PATH + "anomaly_detectors/repeated-id" , + () ->client().performRequest("put", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId, Collections.emptyMap(), new StringEntity(jobConfig2, ContentType.APPLICATION_JSON))); assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(400)); - assertThat(e.getMessage(), containsString("The job cannot be created with the Id 'repeated-id'. The Id is already used.")); + assertThat(e.getMessage(), containsString("The job cannot be created with the Id '" + jobId + "'. The Id is already used.")); } public void testCreateJobsWithIndexNameOption() throws Exception { @@ -246,7 +252,7 @@ public class MlJobIT extends ESRestTestCase { " },\n" + " \"results_index_name\" : \"%s\"}"; - String jobId1 = "aliased-job-1"; + String jobId1 = "create-jobs-with-index-name-option-job-1"; String indexName = "non-default-index"; String jobConfig = String.format(Locale.ROOT, jobTemplate, indexName); @@ -254,7 +260,7 @@ public class MlJobIT extends ESRestTestCase { + "anomaly_detectors/" + jobId1, Collections.emptyMap(), new StringEntity(jobConfig, ContentType.APPLICATION_JSON)); assertEquals(200, response.getStatusLine().getStatusCode()); - String jobId2 = "aliased-job-2"; + String jobId2 = "create-jobs-with-index-name-option-job-2"; response = client().performRequest("put", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId2, Collections.emptyMap(), new StringEntity(jobConfig, ContentType.APPLICATION_JSON)); assertEquals(200, response.getStatusLine().getStatusCode()); @@ -335,9 +341,9 @@ public class MlJobIT extends ESRestTestCase { " }\n" + "}"; - String jobId1 = "job-1"; + String jobId1 = "create-job-in-shared-index-updates-mapping-job-1"; String byFieldName1 = "responsetime"; - String jobId2 = "job-2"; + String jobId2 = "create-job-in-shared-index-updates-mapping-job-2"; String byFieldName2 = "cpu-usage"; String jobConfig = String.format(Locale.ROOT, jobTemplate, byFieldName1); @@ -374,9 +380,9 @@ public class MlJobIT extends ESRestTestCase { " },\n" + " \"results_index_name\" : \"shared-index\"}"; - String jobId1 = "job-1"; + String jobId1 = "create-job-in-custom-shared-index-updates-mapping-job-1"; String byFieldName1 = "responsetime"; - String jobId2 = "job-2"; + String jobId2 = "create-job-in-custom-shared-index-updates-mapping-job-2"; String byFieldName2 = "cpu-usage"; String jobConfig = String.format(Locale.ROOT, jobTemplate, byFieldName1); @@ -432,7 +438,7 @@ public class MlJobIT extends ESRestTestCase { } public void testDeleteJob() throws Exception { - String jobId = "foo"; + String jobId = "delete-job-job"; String indexName = AnomalyDetectorsIndex.RESULTS_INDEX_PREFIX + AnomalyDetectorsIndex.RESULTS_INDEX_DEFAULT; createFarequoteJob(jobId); @@ -468,7 +474,7 @@ public class MlJobIT extends ESRestTestCase { } public void testDeleteJobAfterMissingIndex() throws Exception { - String jobId = "foo"; + String jobId = "delete-job-after-missing-index-job"; String aliasName = AnomalyDetectorsIndex.jobResultsAliasedName(jobId); String indexName = AnomalyDetectorsIndex.RESULTS_INDEX_PREFIX + AnomalyDetectorsIndex.RESULTS_INDEX_DEFAULT; createFarequoteJob(jobId); @@ -498,7 +504,7 @@ public class MlJobIT extends ESRestTestCase { } public void testDeleteJobAfterMissingAlias() throws Exception { - String jobId = "foo"; + String jobId = "delete-job-after-missing-alias-job"; String aliasName = AnomalyDetectorsIndex.jobResultsAliasedName(jobId); String indexName = AnomalyDetectorsIndex.RESULTS_INDEX_PREFIX + AnomalyDetectorsIndex.RESULTS_INDEX_DEFAULT; createFarequoteJob(jobId); @@ -521,7 +527,7 @@ public class MlJobIT extends ESRestTestCase { } public void testMultiIndexDelete() throws Exception { - String jobId = "foo"; + String jobId = "multi-index-delete-job"; String indexName = AnomalyDetectorsIndex.RESULTS_INDEX_PREFIX + AnomalyDetectorsIndex.RESULTS_INDEX_DEFAULT; createFarequoteJob(jobId); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java index 7064d932e13..38321ac6f35 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java @@ -28,34 +28,34 @@ public class TooManyJobsIT extends BaseMlIntegTestCase { startMlCluster(1, 1); // create and open first job, which succeeds: - Job.Builder job = createJob("1"); + Job.Builder job = createJob("close-failed-job-1"); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).get(); assertTrue(putJobResponse.isAcknowledged()); client().execute(OpenJobAction.INSTANCE, new OpenJobAction.Request(job.getId())).get(); assertBusy(() -> { GetJobsStatsAction.Response statsResponse = - client().execute(GetJobsStatsAction.INSTANCE, new GetJobsStatsAction.Request("1")).actionGet(); + client().execute(GetJobsStatsAction.INSTANCE, new GetJobsStatsAction.Request("close-failed-job-1")).actionGet(); assertEquals(statsResponse.getResponse().results().get(0).getState(), JobState.OPENED); }); // create and try to open second job, which fails: - job = createJob("2"); + job = createJob("close-failed-job-2"); putJobRequest = new PutJobAction.Request(job); putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).get(); assertTrue(putJobResponse.isAcknowledged()); expectThrows(ElasticsearchStatusException.class, - () -> client().execute(OpenJobAction.INSTANCE, new OpenJobAction.Request("2")).actionGet()); + () -> client().execute(OpenJobAction.INSTANCE, new OpenJobAction.Request("close-failed-job-2")).actionGet()); // Ensure that the second job didn't even attempt to be opened and we still have 1 job open: GetJobsStatsAction.Response statsResponse = - client().execute(GetJobsStatsAction.INSTANCE, new GetJobsStatsAction.Request("2")).actionGet(); + client().execute(GetJobsStatsAction.INSTANCE, new GetJobsStatsAction.Request("close-failed-job-2")).actionGet(); assertEquals(statsResponse.getResponse().results().get(0).getState(), JobState.CLOSED); ClusterState state = client().admin().cluster().prepareState().get().getState(); PersistentTasksCustomMetaData tasks = state.getMetaData().custom(PersistentTasksCustomMetaData.TYPE); assertEquals(1, tasks.taskMap().size()); // now just double check that the first job is still opened: - PersistentTasksCustomMetaData.PersistentTask task = tasks.getTask(MlMetadata.jobTaskId("1")); + PersistentTasksCustomMetaData.PersistentTask task = tasks.getTask(MlMetadata.jobTaskId("close-failed-job-1")); assertEquals(JobState.OPENED, ((JobTaskStatus) task.getStatus()).getState()); } @@ -71,7 +71,7 @@ public class TooManyJobsIT extends BaseMlIntegTestCase { startMlCluster(numNodes, maxNumberOfJobsPerNode); int clusterWideMaxNumberOfJobs = numNodes * maxNumberOfJobsPerNode; for (int i = 1; i <= (clusterWideMaxNumberOfJobs + 1); i++) { - Job.Builder job = createJob(Integer.toString(i)); + Job.Builder job = createJob("max-number-of-jobs-limit-job-" + Integer.toString(i)); PutJobAction.Request putJobRequest = new PutJobAction.Request(job); PutJobAction.Response putJobResponse = client().execute(PutJobAction.INSTANCE, putJobRequest).get(); assertTrue(putJobResponse.isAcknowledged()); @@ -92,7 +92,7 @@ public class TooManyJobsIT extends BaseMlIntegTestCase { logger.info("good news everybody --> reached maximum number of allowed opened jobs, after trying to open the {}th job", i); // close the first job and check if the latest job gets opened: - CloseJobAction.Request closeRequest = new CloseJobAction.Request("1"); + CloseJobAction.Request closeRequest = new CloseJobAction.Request("max-number-of-jobs-limit-job-1"); closeRequest.setCloseTimeout(TimeValue.timeValueSeconds(20L)); CloseJobAction.Response closeResponse = client().execute(CloseJobAction.INSTANCE, closeRequest).actionGet(); assertTrue(closeResponse.isClosed()); diff --git a/qa/ml-basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java b/qa/ml-basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java index f6b5a09ffea..93e9f20fdc3 100644 --- a/qa/ml-basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java +++ b/qa/ml-basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java @@ -35,7 +35,7 @@ public class MlBasicMultiNodeIT extends ESRestTestCase { } public void testMiniFarequote() throws Exception { - String jobId = "foo1"; + String jobId = "mini-farequote-job"; createFarequoteJob(jobId); Response response = client().performRequest("post", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/_open"); @@ -113,7 +113,7 @@ public class MlBasicMultiNodeIT extends ESRestTestCase { // Ensure all data is searchable client().performRequest("post", "_refresh"); - String jobId = "foo2"; + String jobId = "mini-farequote-with-data-feeder-job"; createFarequoteJob(jobId); String datafeedId = "bar"; createDatafeed(datafeedId, jobId); @@ -159,7 +159,7 @@ public class MlBasicMultiNodeIT extends ESRestTestCase { } public void testMiniFarequoteReopen() throws Exception { - String jobId = "foo1_again"; + String jobId = "mini-farequote-reopen"; createFarequoteJob(jobId); Response response = client().performRequest("post", MachineLearning.BASE_PATH + "anomaly_detectors/" + jobId + "/_open"); diff --git a/qa/ml-disabled/src/test/java/org/elasticsearch/xpack/ml/integration/MlPluginDisabledIT.java b/qa/ml-disabled/src/test/java/org/elasticsearch/xpack/ml/integration/MlPluginDisabledIT.java index 4991c2cc941..b63d5c5e813 100644 --- a/qa/ml-disabled/src/test/java/org/elasticsearch/xpack/ml/integration/MlPluginDisabledIT.java +++ b/qa/ml-disabled/src/test/java/org/elasticsearch/xpack/ml/integration/MlPluginDisabledIT.java @@ -26,7 +26,7 @@ public class MlPluginDisabledIT extends ESRestTestCase { public void testActionsFail() throws Exception { XContentBuilder xContentBuilder = jsonBuilder(); xContentBuilder.startObject(); - xContentBuilder.field("job_id", "foo"); + xContentBuilder.field("actions-fail-job", "foo"); xContentBuilder.field("description", "Analysis of response time by airline"); xContentBuilder.startObject("analysis_config"); diff --git a/qa/ml-single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java b/qa/ml-single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java index 098dff3d0fe..17552e1bb5a 100644 --- a/qa/ml-single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java +++ b/qa/ml-single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java @@ -273,9 +273,9 @@ public class PainlessDomainSplitIT extends ESRestTestCase { " }\n" + " }"; - client().performRequest("PUT", MachineLearning.BASE_PATH + "anomaly_detectors/painless", Collections.emptyMap(), + client().performRequest("PUT", MachineLearning.BASE_PATH + "anomaly_detectors/hrd-split-job", Collections.emptyMap(), new StringEntity(job, ContentType.APPLICATION_JSON)); - client().performRequest("POST", MachineLearning.BASE_PATH + "anomaly_detectors/painless/_open"); + client().performRequest("POST", MachineLearning.BASE_PATH + "anomaly_detectors/hrd-split-job/_open"); // Create index to hold data Settings.Builder settings = Settings.builder() @@ -318,7 +318,7 @@ public class PainlessDomainSplitIT extends ESRestTestCase { // Create and start datafeed String body = "{\n" + - " \"job_id\":\"painless\",\n" + + " \"job_id\":\"hrd-split-job\",\n" + " \"indexes\":[\"painless\"],\n" + " \"types\":[\"test\"],\n" + " \"script_fields\": {\n" + @@ -328,16 +328,16 @@ public class PainlessDomainSplitIT extends ESRestTestCase { " }\n" + " }"; - client().performRequest("PUT", MachineLearning.BASE_PATH + "datafeeds/painless", Collections.emptyMap(), + client().performRequest("PUT", MachineLearning.BASE_PATH + "datafeeds/hrd-split-datafeed", Collections.emptyMap(), new StringEntity(body, ContentType.APPLICATION_JSON)); - client().performRequest("POST", MachineLearning.BASE_PATH + "datafeeds/painless/_start"); + client().performRequest("POST", MachineLearning.BASE_PATH + "datafeeds/hrd-split-datafeed/_start"); boolean passed = awaitBusy(() -> { try { client().performRequest("POST", "/_refresh"); Response response = client().performRequest("GET", - MachineLearning.BASE_PATH + "anomaly_detectors/painless/results/records"); + MachineLearning.BASE_PATH + "anomaly_detectors/hrd-split-job/results/records"); String responseBody = EntityUtils.toString(response.getEntity()); if (responseBody.contains("\"count\":2")) {