honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] Removed unused vars / params. 

Original commit: elastic/x-pack-elasticsearch@5d3280dbec
This commit is contained in:
Martijn van Groningen 2017-04-04 14:21:17 +02:00
parent 1465711762
commit 0f9bd3a08d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
View File

@ -475,7 +475,7 @@ public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.R
static Assignment selectLeastLoadedMlNode(String jobId, ClusterState clusterState, int maxConcurrentJobAllocations, static Assignment selectLeastLoadedMlNode(String jobId, ClusterState clusterState, int maxConcurrentJobAllocations,
Logger logger) { Logger logger) {
List<String> unavailableIndices = verifyIndicesPrimaryShardsAreActive(logger, jobId, clusterState); List<String> unavailableIndices = verifyIndicesPrimaryShardsAreActive(jobId, clusterState);
if (unavailableIndices.size() != 0) { if (unavailableIndices.size() != 0) {
String reason = "Not opening job [" + jobId + "], because not all primary shards are active for the following indices [" + String reason = "Not opening job [" + jobId + "], because not all primary shards are active for the following indices [" +
String.join(",", unavailableIndices) + "]"; String.join(",", unavailableIndices) + "]";
@ -553,9 +553,7 @@ public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.R
return new String[]{AnomalyDetectorsIndex.jobStateIndexName(), jobResultIndex, AnomalyDetectorsIndex.ML_META_INDEX}; return new String[]{AnomalyDetectorsIndex.jobStateIndexName(), jobResultIndex, AnomalyDetectorsIndex.ML_META_INDEX};
} }
static List<String> verifyIndicesPrimaryShardsAreActive(Logger logger, String jobId, ClusterState clusterState) { static List<String> verifyIndicesPrimaryShardsAreActive(String jobId, ClusterState clusterState) {
MlMetadata mlMetadata = clusterState.metaData().custom(MlMetadata.TYPE);
Job job = mlMetadata.getJobs().get(jobId);
String[] indices = indicesOfInterest(clusterState, jobId); String[] indices = indicesOfInterest(clusterState, jobId);
List<String> unavailableIndices = new ArrayList<>(indices.length); List<String> unavailableIndices = new ArrayList<>(indices.length);
for (String index : indices) { for (String index : indices) {

4
plugin/src/test/java/org/elasticsearch/xpack/ml/action/OpenJobActionTests.java
View File

@ -254,7 +254,7 @@ public class OpenJobActionTests extends ESTestCase {
csBuilder.metaData(metaData); csBuilder.metaData(metaData);
ClusterState cs = csBuilder.build(); ClusterState cs = csBuilder.build();
assertEquals(0, OpenJobAction.verifyIndicesPrimaryShardsAreActive(logger, "job_id", cs).size()); assertEquals(0, OpenJobAction.verifyIndicesPrimaryShardsAreActive("job_id", cs).size());
metaData = new MetaData.Builder(cs.metaData()); metaData = new MetaData.Builder(cs.metaData());
routingTable = new RoutingTable.Builder(cs.routingTable()); routingTable = new RoutingTable.Builder(cs.routingTable());
@ -274,7 +274,7 @@ public class OpenJobActionTests extends ESTestCase {
csBuilder.routingTable(routingTable.build()); csBuilder.routingTable(routingTable.build());
csBuilder.metaData(metaData); csBuilder.metaData(metaData);
List<String> result = OpenJobAction.verifyIndicesPrimaryShardsAreActive(logger, "job_id", csBuilder.build()); List<String> result = OpenJobAction.verifyIndicesPrimaryShardsAreActive("job_id", csBuilder.build());
assertEquals(1, result.size()); assertEquals(1, result.size());
assertEquals(indexToRemove, result.get(0)); assertEquals(indexToRemove, result.get(0));
} }