Skip to content

Commit c6c91e7

Browse files
committed
spotless
1 parent d0cb304 commit c6c91e7

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -423,29 +423,29 @@ public void testSLMWithMasterFailover() throws Exception {
423423
assertEquals(0, policy.getPolicyStats().getSnapshotFailedCount());
424424
assertEquals(2, policy.getPolicyStats().getSnapshotTakenCount());
425425
});
426-
//
427-
// final String snapshotName = executePolicy(policyName);
428-
// assertBusy(() -> {
429-
// final SnapshotInfo snapshotInfo;
430-
// try {
431-
// GetSnapshotsResponse snapshotsStatusResponse = clusterAdmin().prepareGetSnapshots(TEST_REQUEST_TIMEOUT, REPO)
432-
// .setSnapshots(snapshotName)
433-
// .get();
434-
// snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
435-
// } catch (SnapshotMissingException sme) {
436-
// throw new AssertionError(sme);
437-
// }
438-
// assertEquals(SnapshotState.SUCCESS, snapshotInfo.state());
439-
// }, 30L, TimeUnit.SECONDS);
440-
//
441-
// assertBusy(() -> {
442-
// SnapshotLifecyclePolicyItem policy = client().execute(
443-
// GetSnapshotLifecycleAction.INSTANCE,
444-
// new GetSnapshotLifecycleAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, policyName)
445-
// ).get().getPolicies().getFirst();
446-
// assertNotNull(policy.getLastSuccess());
447-
// assertNull(policy.getLastFailure());
448-
// }, 30L, TimeUnit.SECONDS);
426+
//
427+
// final String snapshotName = executePolicy(policyName);
428+
// assertBusy(() -> {
429+
// final SnapshotInfo snapshotInfo;
430+
// try {
431+
// GetSnapshotsResponse snapshotsStatusResponse = clusterAdmin().prepareGetSnapshots(TEST_REQUEST_TIMEOUT, REPO)
432+
// .setSnapshots(snapshotName)
433+
// .get();
434+
// snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
435+
// } catch (SnapshotMissingException sme) {
436+
// throw new AssertionError(sme);
437+
// }
438+
// assertEquals(SnapshotState.SUCCESS, snapshotInfo.state());
439+
// }, 30L, TimeUnit.SECONDS);
440+
//
441+
// assertBusy(() -> {
442+
// SnapshotLifecyclePolicyItem policy = client().execute(
443+
// GetSnapshotLifecycleAction.INSTANCE,
444+
// new GetSnapshotLifecycleAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, policyName)
445+
// ).get().getPolicies().getFirst();
446+
// assertNotNull(policy.getLastSuccess());
447+
// assertNull(policy.getLastFailure());
448+
// }, 30L, TimeUnit.SECONDS);
449449

450450
}
451451

x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTask.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,11 @@ public ClusterState execute(ClusterState currentState) throws Exception {
553553
snapshotInfo.snapshotId().getName(),
554554
snapshotInfo.startTime(),
555555
snapshotInfo.endTime(),
556-
String.format(Locale.ROOT,
556+
String.format(
557+
Locale.ROOT,
557558
"found non-successful registered snapshot [%s] which is no longer running",
558-
snapshotInfo.snapshotId().getName())
559+
snapshotInfo.snapshotId().getName()
560+
)
559561
)
560562
);
561563
newPolicyMetadata.incrementInvocationsSinceLastSuccess();

0 commit comments

Comments
 (0)