Snapshot invocations WIP

Author: nielsbauman

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

@@ -496,14 +496,6 @@ public ClusterState execute(ClusterState currentState) throws Exception {
             final SnapshotLifecyclePolicyMetadata.Builder newPolicyMetadata = SnapshotLifecyclePolicyMetadata.builder(policyMetadata);
             SnapshotLifecycleStats newStats = snapMeta.getStats();
 
-            if (registeredSnapshots.contains(snapshotId) == false) {
-                logger.warn(
-                    "Snapshot [{}] not found in registered set after snapshot completion. This means snapshot was"
-                        + " recorded as a failure by another snapshot's cleanup run.",
-                    snapshotId.getName()
-                );
-            }
-
             final Set<SnapshotId> runningSnapshots = currentlyRunningSnapshots(currentState);
             final List<PolicySnapshot> newRegistered = new ArrayList<>();
 
@@ -553,7 +545,13 @@ public ClusterState execute(ClusterState currentState) throws Exception {
             }
 
             // Add stats from the just completed snapshot execution
-            if (exception.isPresent()) {
+            if (registeredSnapshots.contains(snapshotId) == false) {
+                logger.warn(
+                    "Snapshot [{}] not found in registered set after snapshot completion. This means snapshot was"
+                        + " recorded as a failure by another snapshot's cleanup run.",
+                    snapshotId.getName()
+                );
+            } else if (exception.isPresent()) {
                 newStats = newStats.withFailedIncremented(policyName);
                 newPolicyMetadata.setLastFailure(
                     new SnapshotInvocationRecord(

x-pack/plugin/slm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTaskTests.java

@@ -469,7 +469,13 @@ public void testCleanUpRegisteredInitiatedBySuccess() throws Exception {
         var definedSlmPolicies = List.of(policyId);
         var registeredSnapshots = Map.of(
             policyId,
-            List.of(stillRunning, inferredFailureSnapshot, snapshotInfoSuccess.snapshotId(), snapshotInfoFailure.snapshotId())
+            List.of(
+                stillRunning,
+                inferredFailureSnapshot,
+                snapshotInfoSuccess.snapshotId(),
+                snapshotInfoFailure.snapshotId(),
+                initiatingSnapshot
+            )
         );
         var inProgress = Map.of(policyId, List.of(stillRunning));
         ClusterState clusterState = buildClusterState(projectId, definedSlmPolicies, registeredSnapshots, inProgress);
@@ -528,7 +534,8 @@ public void testCleanUpRegisteredInitiatedByFailure() throws Exception {
                 inferredFailureSnapshot,
                 snapshotInfoSuccess.snapshotId(),
                 snapshotInfoFailure1.snapshotId(),
-                snapshotInfoFailure2.snapshotId()
+                snapshotInfoFailure2.snapshotId(),
+                initiatingSnapshot
             )
         );
         var inProgress = Map.of(policyId, List.of(stillRunning));