Skip to content

Commit 0ec99b6

Browse files
edsavageedsavage
committed
Spotless Apply
1 parent 78d0d8e commit 0ec99b6

File tree

5 files changed

+71
-99
lines changed

5 files changed

+71
-99
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@
2222
import org.elasticsearch.core.Nullable;
2323
import org.elasticsearch.core.TimeValue;
2424
import org.elasticsearch.logging.LogManager;
25-
import org.elasticsearch.logging.Logger;
2625
import org.elasticsearch.xcontent.ObjectParser;
2726
import org.elasticsearch.xcontent.ObjectParser.ValueType;
2827
import org.elasticsearch.xcontent.ParseField;
2928
import org.elasticsearch.xcontent.ToXContentObject;
3029
import org.elasticsearch.xcontent.XContentBuilder;
3130
import org.elasticsearch.xpack.core.common.time.TimeUtils;
3231
import org.elasticsearch.xpack.core.ml.MlConfigVersion;
33-
import org.elasticsearch.xpack.core.ml.utils.MlAnomaliesIndexUtils;
3432
import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig;
3533
import org.elasticsearch.xpack.core.ml.job.messages.Messages;
3634
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndexFields;
@@ -1327,8 +1325,8 @@ public Job build(
13271325
ClusterState state,
13281326
IndexNameExpressionResolver indexNameExpressionResolver
13291327
) {
1330-
// setCreateTime(createTime);
1331-
// setJobVersion(MlConfigVersion.CURRENT);
1328+
// setCreateTime(createTime);
1329+
// setJobVersion(MlConfigVersion.CURRENT);
13321330
setClusterState(state);
13331331
setIndexNameExpressionResolver(indexNameExpressionResolver);
13341332
return build(createTime);

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/MlAnomaliesIndexUtils.java‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@
2525
public class MlAnomaliesIndexUtils {
2626
public static void rollover(Client client, RolloverRequest rolloverRequest, ActionListener<String> listener) {
2727
client.admin()
28-
.indices()
29-
.rolloverIndex(
30-
rolloverRequest,
31-
ActionListener.wrap(response -> listener.onResponse(response.getNewIndex()), e -> {
32-
if (e instanceof ResourceAlreadyExistsException alreadyExistsException) {
33-
// The destination index already exists possibly because it has been rolled over already.
34-
listener.onResponse(alreadyExistsException.getIndex().getName());
35-
} else {
36-
listener.onFailure(e);
37-
}
38-
})
39-
);
28+
.indices()
29+
.rolloverIndex(rolloverRequest, ActionListener.wrap(response -> listener.onResponse(response.getNewIndex()), e -> {
30+
if (e instanceof ResourceAlreadyExistsException alreadyExistsException) {
31+
// The destination index already exists possibly because it has been rolled over already.
32+
listener.onResponse(alreadyExistsException.getIndex().getName());
33+
} else {
34+
listener.onFailure(e);
35+
}
36+
}));
4037
}
4138

4239
public static void createAliasForRollover(
@@ -49,10 +46,7 @@ public static void createAliasForRollover(
4946
logger.warn("creating rollover [{}] alias for [{}]", aliasName, indexName);
5047
client.admin()
5148
.indices()
52-
.prepareAliases(
53-
TimeValue.THIRTY_SECONDS,
54-
TimeValue.THIRTY_SECONDS
55-
)
49+
.prepareAliases(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS)
5650
.addAliasAction(IndicesAliasesRequest.AliasActions.add().index(indexName).alias(aliasName).isHidden(true))
5751
.execute(listener);
5852
}
@@ -113,5 +107,4 @@ static boolean isAnomaliesReadAlias(String aliasName) {
113107
return MlStrings.isValidId(jobIdPart);
114108
}
115109

116-
117110
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.ElasticsearchStatusException;
1212
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionListener;
14-
1514
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
1615
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
1716
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
@@ -176,7 +175,7 @@ private void rollAndUpdateAliases(ClusterState clusterState, String index, Actio
176175
}
177176

178177
private void rollover(String alias, @Nullable String newIndexName, ActionListener<String> listener) {
179-
MlAnomaliesIndexUtils.rollover(client, new RolloverRequest(alias, newIndexName), listener);
178+
MlAnomaliesIndexUtils.rollover(client, new RolloverRequest(alias, newIndexName), listener);
180179
}
181180

182181
private void createAliasForRollover(String indexName, String aliasName, ActionListener<IndicesAliasesResponse> listener) {

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

Lines changed: 56 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
*/
77
package org.elasticsearch.xpack.ml;
88

9-
import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
10-
import org.elasticsearch.action.admin.indices.rollover.RolloverRequestBuilder;
11-
import org.elasticsearch.client.internal.OriginSettingClient;
12-
import org.elasticsearch.common.unit.ByteSizeUnit;
13-
import org.elasticsearch.common.unit.ByteSizeValue;
14-
import org.elasticsearch.index.IndexNotFoundException;
15-
import org.elasticsearch.logging.LogManager;
169
import org.apache.lucene.util.SetOnce;
1710
import org.elasticsearch.action.ActionListener;
1811
import org.elasticsearch.action.ActionType;
@@ -21,23 +14,30 @@
2114
import org.elasticsearch.action.admin.cluster.node.tasks.list.TransportListTasksAction;
2215
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
2316
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
17+
import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
18+
import org.elasticsearch.action.admin.indices.rollover.RolloverRequestBuilder;
2419
import org.elasticsearch.action.support.IndicesOptions;
2520
import org.elasticsearch.action.support.master.AcknowledgedRequest;
2621
import org.elasticsearch.action.support.master.AcknowledgedResponse;
2722
import org.elasticsearch.client.internal.Client;
23+
import org.elasticsearch.client.internal.OriginSettingClient;
2824
import org.elasticsearch.cluster.ClusterName;
2925
import org.elasticsearch.cluster.ClusterState;
3026
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3127
import org.elasticsearch.cluster.metadata.ProjectMetadata;
3228
import org.elasticsearch.cluster.service.ClusterService;
3329
import org.elasticsearch.common.settings.Settings;
30+
import org.elasticsearch.common.unit.ByteSizeUnit;
31+
import org.elasticsearch.common.unit.ByteSizeValue;
3432
import org.elasticsearch.common.util.concurrent.EsExecutors;
3533
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
3634
import org.elasticsearch.common.util.set.Sets;
3735
import org.elasticsearch.core.Predicates;
3836
import org.elasticsearch.core.Releasable;
3937
import org.elasticsearch.core.TimeValue;
4038
import org.elasticsearch.core.Tuple;
39+
import org.elasticsearch.index.IndexNotFoundException;
40+
import org.elasticsearch.logging.LogManager;
4141
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
4242
import org.elasticsearch.tasks.TaskInfo;
4343
import org.elasticsearch.threadpool.Scheduler;
@@ -92,7 +92,6 @@ public class MlDailyMaintenanceService implements Releasable {
9292

9393
private final IndexNameExpressionResolver expressionResolver;
9494

95-
9695
private final boolean isAnomalyDetectionEnabled;
9796
private final boolean isDataFrameAnalyticsEnabled;
9897
private final boolean isNlpEnabled;
@@ -164,22 +163,22 @@ void setDeleteExpiredDataRequestsPerSecond(float value) {
164163
* @param clusterName the cluster name is used to seed the random offset
165164
* @return the delay to the next time the maintenance should be triggered
166165
*/
167-
// private static TimeValue delayToNextTime(ClusterName clusterName) {
168-
// Random random = new Random(clusterName.hashCode());
169-
// int minutesOffset = random.ints(0, MAX_TIME_OFFSET_MINUTES).findFirst().getAsInt();
170-
//
171-
// ZonedDateTime now = ZonedDateTime.now(Clock.systemDefaultZone());
172-
// ZonedDateTime next = now.plusDays(1).toLocalDate().atStartOfDay(now.getZone()).plusMinutes(30).plusMinutes(minutesOffset);
173-
// return TimeValue.timeValueMillis(next.toInstant().toEpochMilli() - now.toInstant().toEpochMilli());
174-
// }
166+
// private static TimeValue delayToNextTime(ClusterName clusterName) {
167+
// Random random = new Random(clusterName.hashCode());
168+
// int minutesOffset = random.ints(0, MAX_TIME_OFFSET_MINUTES).findFirst().getAsInt();
169+
//
170+
// ZonedDateTime now = ZonedDateTime.now(Clock.systemDefaultZone());
171+
// ZonedDateTime next = now.plusDays(1).toLocalDate().atStartOfDay(now.getZone()).plusMinutes(30).plusMinutes(minutesOffset);
172+
// return TimeValue.timeValueMillis(next.toInstant().toEpochMilli() - now.toInstant().toEpochMilli());
173+
// }
175174

176175
private static TimeValue delayToNextTime(ClusterName clusterName) {
177176
Random random = new Random(clusterName.hashCode());
178177
int minutesOffset = 5;
179178

180179
ZonedDateTime now = ZonedDateTime.now(Clock.systemDefaultZone());
181180
ZonedDateTime next = now.plusMinutes(minutesOffset);
182-
var ret = TimeValue.timeValueMillis(next.toInstant().toEpochMilli() - now.toInstant().toEpochMilli());
181+
var ret = TimeValue.timeValueMillis(next.toInstant().toEpochMilli() - now.toInstant().toEpochMilli());
183182
logger.warn("Delay until next time [{}] is [{}]", next, ret);
184183
return ret;
185184
}
@@ -246,57 +245,48 @@ private void triggerTasks() {
246245

247246
private void triggerAnomalyDetectionMaintenance() {
248247
// Step 5: Log any error that could have happened
249-
ActionListener<AcknowledgedResponse> finalListener = ActionListener.wrap(
250-
response -> {
251-
if (response.isAcknowledged() == false) {
252-
logger.warn("[ML] maintenance task: triggerRollResultsIndicesIfNecessaryTask failed");
253-
} else {
254-
logger.info("[ML] maintenance task: triggerRollResultsIndicesIfNecessaryTask succeeded");
255-
}
256-
},
257-
e -> logger.warn("An error occurred during [ML] maintenance tasks execution ", e) );
248+
ActionListener<AcknowledgedResponse> finalListener = ActionListener.wrap(response -> {
249+
if (response.isAcknowledged() == false) {
250+
logger.warn("[ML] maintenance task: triggerRollResultsIndicesIfNecessaryTask failed");
251+
} else {
252+
logger.info("[ML] maintenance task: triggerRollResultsIndicesIfNecessaryTask succeeded");
253+
}
254+
}, e -> logger.warn("An error occurred during [ML] maintenance tasks execution ", e));
258255

259256
// Step 4: Roll over results indices if necessary
260-
ActionListener<AcknowledgedResponse> rollResultsIndicesIfNecessaryListener = ActionListener.wrap(
261-
unused -> {
262-
logger.warn("1. About to call [triggerRollResultsIndicesIfNecessaryTask]");
263-
264-
triggerRollResultsIndicesIfNecessaryTask(finalListener);},
265-
e -> {
266-
logger.warn("[ML] maintenance task: triggerDeleteExpiredDataTask failed ", e);
267-
logger.warn("2. About to call [triggerRollResultsIndicesIfNecessaryTask]");
257+
ActionListener<AcknowledgedResponse> rollResultsIndicesIfNecessaryListener = ActionListener.wrap(unused -> {
258+
logger.warn("1. About to call [triggerRollResultsIndicesIfNecessaryTask]");
268259

260+
triggerRollResultsIndicesIfNecessaryTask(finalListener);
261+
}, e -> {
262+
logger.warn("[ML] maintenance task: triggerDeleteExpiredDataTask failed ", e);
263+
logger.warn("2. About to call [triggerRollResultsIndicesIfNecessaryTask]");
269264

270-
// Note: Steps 1-4 are independent, so continue upon errors.
271-
triggerRollResultsIndicesIfNecessaryTask(finalListener);
272-
}
273-
);
265+
// Note: Steps 1-4 are independent, so continue upon errors.
266+
triggerRollResultsIndicesIfNecessaryTask(finalListener);
267+
});
274268

275269
// Step 3: Delete expired data
276-
ActionListener<AcknowledgedResponse> deleteJobsListener = ActionListener.wrap(
277-
unused -> {
278-
logger.warn("About to call [triggerDeleteExpiredDataTask]");
279-
triggerDeleteExpiredDataTask(rollResultsIndicesIfNecessaryListener);},
280-
e -> {
281-
logger.warn("[ML] maintenance task: triggerResetJobsInStateResetWithoutResetTask failed", e);
282-
logger.warn("About to call [triggerDeleteExpiredDataTask]");
283-
// Note: Steps 1-4 are independent, so continue upon errors.
284-
triggerDeleteExpiredDataTask(rollResultsIndicesIfNecessaryListener);
285-
}
286-
);
270+
ActionListener<AcknowledgedResponse> deleteJobsListener = ActionListener.wrap(unused -> {
271+
logger.warn("About to call [triggerDeleteExpiredDataTask]");
272+
triggerDeleteExpiredDataTask(rollResultsIndicesIfNecessaryListener);
273+
}, e -> {
274+
logger.warn("[ML] maintenance task: triggerResetJobsInStateResetWithoutResetTask failed", e);
275+
logger.warn("About to call [triggerDeleteExpiredDataTask]");
276+
// Note: Steps 1-4 are independent, so continue upon errors.
277+
triggerDeleteExpiredDataTask(rollResultsIndicesIfNecessaryListener);
278+
});
287279

288280
// Step 2: Reset jobs that are in resetting state without task
289-
ActionListener<AcknowledgedResponse> resetJobsListener = ActionListener.wrap(
290-
unused -> {
291-
logger.warn("About to call [triggerResetJobsInStateResetWithoutResetTask]");
292-
triggerResetJobsInStateResetWithoutResetTask(deleteJobsListener);},
293-
e -> {
294-
logger.warn("[ML] maintenance task: triggerDeleteJobsInStateDeletingWithoutDeletionTask failed", e);
295-
logger.warn("About to call [triggerResetJobsInStateResetWithoutResetTask]");
296-
// Note: Steps 1-4 are independent, so continue upon errors.
297-
triggerResetJobsInStateResetWithoutResetTask(deleteJobsListener);
298-
}
299-
);
281+
ActionListener<AcknowledgedResponse> resetJobsListener = ActionListener.wrap(unused -> {
282+
logger.warn("About to call [triggerResetJobsInStateResetWithoutResetTask]");
283+
triggerResetJobsInStateResetWithoutResetTask(deleteJobsListener);
284+
}, e -> {
285+
logger.warn("[ML] maintenance task: triggerDeleteJobsInStateDeletingWithoutDeletionTask failed", e);
286+
logger.warn("About to call [triggerResetJobsInStateResetWithoutResetTask]");
287+
// Note: Steps 1-4 are independent, so continue upon errors.
288+
triggerResetJobsInStateResetWithoutResetTask(deleteJobsListener);
289+
});
300290

301291
// Step 1: Delete jobs that are in deleting state without task
302292
logger.warn("About to call [triggerDeleteJobsInStateDeletingWithoutDeletionTask]");
@@ -353,11 +343,7 @@ private void rollAndUpdateAliases(ClusterState clusterState, String index, Actio
353343
// We must still clean up the temporary alias from the original index.
354344
// The index name is either the original one provided or the original with a suffix appended.
355345
var indexName = MlIndexAndAlias.has6DigitSuffix(index) ? index : index + MlIndexAndAlias.FIRST_INDEX_SIX_DIGIT_SUFFIX;
356-
logger.warn(
357-
"[ML] Removing dangling rollover alias [{}] from index [{}].",
358-
rolloverAlias,
359-
indexName
360-
);
346+
logger.warn("[ML] Removing dangling rollover alias [{}] from index [{}].", rolloverAlias, indexName);
361347

362348
// Make sure we use a fresh IndicesAliasesRequestBuilder, the original one may have changed internal state.
363349
IndicesAliasesRequestBuilder localAliasRequestBuilder = client.admin()
@@ -415,13 +401,11 @@ private void rollAndUpdateAliases(ClusterState clusterState, String index, Actio
415401
.setNewIndexName(newIndexName)
416402
// .setConditions(RolloverConditions.newBuilder().addMaxIndexSizeCondition(ByteSizeValue.of(50,
417403
// ByteSizeUnit.GB)).build()) // TODO Make these settings?
418-
.setConditions(
419-
RolloverConditions.newBuilder().addMaxIndexSizeCondition(ByteSizeValue.of(2, ByteSizeUnit.MB)).build()
420-
) // TODO
421-
// Make
422-
// these
423-
// changeable
424-
// settings?
404+
.setConditions(RolloverConditions.newBuilder().addMaxIndexSizeCondition(ByteSizeValue.of(2, ByteSizeUnit.MB)).build()) // TODO
405+
// Make
406+
// these
407+
// changeable
408+
// settings?
425409
.request(),
426410
rolloverListener
427411
);
@@ -452,7 +436,6 @@ private void triggerRollResultsIndicesIfNecessaryTask(ActionListener<Acknowledge
452436
logger.info("[ML] maintenance task: triggerRollResultsIndicesIfNecessaryTask");
453437
logger.warn("AD results indices [{}]", (Object) indices);
454438

455-
456439
for (String index : indices) {
457440
logger.warn("Processing index [{}]", index);
458441
// Check if this index has already been rolled over

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,14 @@ static void validateCategorizationAnalyzerOrSetDefault(
219219
);
220220
} else if (analysisConfig.getCategorizationFieldName() != null
221221
&& minNodeVersion.onOrAfter(MIN_ML_CONFIG_VERSION_FOR_STANDARD_CATEGORIZATION_ANALYZER)) {
222-
LogManager.getLogger(JobManager.class).warn("XXX: 3. Setting standard categorization analyzer");
222+
LogManager.getLogger(JobManager.class).warn("XXX: 3. Setting standard categorization analyzer");
223223
// Any supplied categorization filters are transferred into the new categorization analyzer.
224224
// The user supplied categorization filters will already have been validated when the put job
225225
// request was built, so we know they're valid.
226226
AnalysisConfig.Builder analysisConfigBuilder = new AnalysisConfig.Builder(analysisConfig).setCategorizationAnalyzerConfig(
227227
CategorizationAnalyzerConfig.buildStandardCategorizationAnalyzer(analysisConfig.getCategorizationFilters())
228228
).setCategorizationFilters(null);
229-
LogManager.getLogger(JobManager.class).warn("XXX: 4. Validating categorization analyzer");
229+
LogManager.getLogger(JobManager.class).warn("XXX: 4. Validating categorization analyzer");
230230
jobBuilder.setAnalysisConfig(analysisConfigBuilder);
231231
}
232232
LogManager.getLogger(JobManager.class).warn("XXX: 5. Done validating categorization analyzer");
@@ -258,7 +258,6 @@ public void putJob(
258258
Job job = jobBuilder.build(new Date(), state, indexNameExpressionResolver);
259259
logger.warn("[ML]: Created job [{}]", jobBuilder.getId());
260260

261-
262261
ActionListener<Boolean> putJobListener = new ActionListener<>() {
263262
@Override
264263
public void onResponse(Boolean mappingsUpdated) {

0 commit comments

Comments
 (0)