Skip to content

Commit 06e4bba

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 192d6cd commit 06e4bba

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ public TransportRetryAction(
6060
}
6161

6262
@Override
63-
protected void masterOperation(Task task, RetryActionRequest request, ClusterState state, ActionListener<AcknowledgedResponse> listener) {
63+
protected void masterOperation(
64+
Task task,
65+
RetryActionRequest request,
66+
ClusterState state,
67+
ActionListener<AcknowledgedResponse> listener
68+
) {
6469
if (request.requireError() == false) {
6570
maybeRunAsyncAction(state, request.indices());
6671
listener.onResponse(AcknowledgedResponse.TRUE);
@@ -84,11 +89,7 @@ private void maybeRunAsyncAction(ClusterState state, String[] indices) {
8489
IndexMetadata idxMeta = state.metadata().getProject().index(index);
8590
if (idxMeta == null) {
8691
// The index has somehow been deleted - there shouldn't be any opportunity for this to happen, but just in case.
87-
logger.debug(
88-
"index ["
89-
+ index
90-
+ "] has been deleted, skipping async action check"
91-
);
92+
logger.debug("index [" + index + "] has been deleted, skipping async action check");
9293
return;
9394
}
9495
LifecycleExecutionState lifecycleState = idxMeta.getLifecycleExecutionState();

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ public class DataStreamsUpgradeIT extends AbstractUpgradeTestCase {
4848
@Before
4949
public void setupILMSettings() throws IOException {
5050
Request request = new Request("PUT", "/_cluster/settings");
51-
request.setJsonEntity(
52-
"""
51+
request.setJsonEntity("""
5352
{ "persistent": {"indices.lifecycle.poll_interval": "1s"} }
54-
"""
55-
);
53+
""");
5654
assertOK(client().performRequest(request));
5755
}
5856

@@ -261,7 +259,11 @@ private void checkILMPhase(String dataStreamName, Map<String, Map<String, Object
261259

262260
Request request = new Request("GET", dataStreamName + "/_ilm/explain");
263261
Response response = client().performRequest(request);
264-
Map<String, Object> responseMap = XContentHelper.convertToMap(JsonXContent.jsonXContent, response.getEntity().getContent(), false);
262+
Map<String, Object> responseMap = XContentHelper.convertToMap(
263+
JsonXContent.jsonXContent,
264+
response.getEntity().getContent(),
265+
false
266+
);
265267
Map<String, Object> indices = (Map<String, Object>) responseMap.get("indices");
266268
for (var index : indices.keySet()) {
267269
if (index.equals(writeIndex) == false) {
@@ -319,7 +321,8 @@ private Map<String, Object> getIndexSettingsFromIndexMetadata(Map<String, Object
319321
return (Map<String, Object>) ((Map<String, Object>) indexMetadata.get("settings")).get("index");
320322
}
321323

322-
private void createAndRolloverDataStream(String dataStreamName, int numRollovers, boolean hasILMPolicy, boolean ilmEnabled) throws IOException {
324+
private void createAndRolloverDataStream(String dataStreamName, int numRollovers, boolean hasILMPolicy, boolean ilmEnabled)
325+
throws IOException {
323326
if (hasILMPolicy) {
324327
createIlmPolicy();
325328
}
@@ -404,7 +407,7 @@ private void createAndRolloverDataStream(String dataStreamName, int numRollovers
404407
bulkLoadData(dataStreamName);
405408
for (int i = 0; i < numRollovers; i++) {
406409
String oldIndexName = rollover(dataStreamName);
407-
if (ilmEnabled ==false && randomBoolean()) {
410+
if (ilmEnabled == false && randomBoolean()) {
408411
closeIndex(oldIndexName);
409412
}
410413
bulkLoadData(dataStreamName);
@@ -581,8 +584,13 @@ private void createDataStreamFromNonDataStreamIndices(String dataStreamFromNonDa
581584
}
582585

583586
@SuppressWarnings("unchecked")
584-
private void upgradeDataStream(String dataStreamName, int numRolloversOnOldCluster, int expectedSuccessesCount, int expectedErrorCount, boolean ilmEnabled)
585-
throws Exception {
587+
private void upgradeDataStream(
588+
String dataStreamName,
589+
int numRolloversOnOldCluster,
590+
int expectedSuccessesCount,
591+
int expectedErrorCount,
592+
boolean ilmEnabled
593+
) throws Exception {
586594
Set<String> indicesNeedingUpgrade = getDataStreamIndices(dataStreamName);
587595
final int explicitRolloverOnNewClusterCount = randomIntBetween(0, 2);
588596
for (int i = 0; i < explicitRolloverOnNewClusterCount; i++) {

0 commit comments

Comments
 (0)