Refactored Code

Signed-off-by: Tarun-kishore <[email protected]>

Author: Tarun-kishore

src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/creation/CreatingState.kt

@@ -41,7 +41,7 @@ object CreatingState : State {
         if (job.creation == null) {
             log.warn("Policy creation config becomes null before trying to create snapshot. Reset.")
             return SMResult.Fail(
-                metadataBuilder, WorkflowType.CREATION,
+                metadataBuilder.resetCreation(), WorkflowType.CREATION, true,
             )
         }
 

src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/deletion/DeletingState.kt

@@ -64,21 +64,12 @@ object DeletingState : State {
         val policySnapshots = getSnapshotsRes.snapshots
 
         // Get pattern-based snapshots if pattern is specified
-        val patternSnapshots = if (job.deletion.snapshotPattern != null) {
-            try {
-                client.getSnapshots(job.deletion.snapshotPattern, repository)
-            } catch (ex: Exception) {
-                log.error("Caught exception while getting snapshots for pattern ${job.deletion.snapshotPattern}.", ex)
-                metadataBuilder.setLatestExecution(
-                    status = SMMetadata.LatestExecution.Status.RETRYING,
-                    message = "Caught exception while getting snapshots for pattern ${job.deletion.snapshotPattern}.",
-                    cause = ex,
-                )
-                return SMResult.Fail(metadataBuilder, WorkflowType.DELETION)
-            }
-        } else {
-            emptyList()
+        val patternSnapshotsResult = DeletionStateUtils.getPatternSnapshots(context, metadataBuilder)
+        if (patternSnapshotsResult == null) {
+            return SMResult.Fail(metadataBuilder, WorkflowType.DELETION)
         }
+        val (patternSnapshots, updatedMetadataBuilder) = patternSnapshotsResult
+        metadataBuilder = updatedMetadataBuilder
 
         // Combine both sets of snapshots, removing duplicates by snapshot name
         val allSnapshots = (policySnapshots + patternSnapshots)

src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/deletion/DeletionFinishedState.kt

@@ -54,21 +54,12 @@ object DeletionFinishedState : State {
             val policySnapshots = getSnapshotsRes.snapshots
 
             // Get pattern-based snapshots if pattern is specified
-            val patternSnapshots = if (job.deletion?.snapshotPattern != null) {
-                try {
-                    client.getSnapshots(job.deletion.snapshotPattern, repository)
-                } catch (ex: Exception) {
-                    log.error("Caught exception while getting snapshots for pattern ${job.deletion.snapshotPattern}.", ex)
-                    metadataBuilder.setLatestExecution(
-                        status = SMMetadata.LatestExecution.Status.RETRYING,
-                        message = "Caught exception while getting snapshots for pattern ${job.deletion.snapshotPattern}.",
-                        cause = ex,
-                    )
-                    return SMResult.Fail(metadataBuilder, WorkflowType.DELETION)
-                }
-            } else {
-                emptyList()
+            val patternSnapshotsResult = DeletionStateUtils.getPatternSnapshots(context, metadataBuilder)
+            if (patternSnapshotsResult == null) {
+                return SMResult.Fail(metadataBuilder, WorkflowType.DELETION)
             }
+            val (patternSnapshots, updatedMetadataBuilder) = patternSnapshotsResult
+            metadataBuilder = updatedMetadataBuilder
 
             // Combine both sets of snapshots, removing duplicates by snapshot name
             val getSnapshots = (policySnapshots + patternSnapshots).distinctBy { it.snapshotId().name }

src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/deletion/DeletionStateUtils.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.indexmanagement.snapshotmanagement.engine.states.deletion
+
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.getSnapshots
+import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata
+import org.opensearch.snapshots.SnapshotInfo
+
+object DeletionStateUtils {
+
+    /**
+     * Get pattern-based snapshots if pattern is specified
+     *
+     * @param context The state machine context
+     * @param metadataBuilder The current metadata builder
+     * @return A pair containing the pattern snapshots list and updated metadata builder, or null if failed
+     */
+    suspend fun getPatternSnapshots(
+        context: SMStateMachine,
+        metadataBuilder: SMMetadata.Builder,
+    ): Pair<List<SnapshotInfo>, SMMetadata.Builder>? {
+        val client = context.client
+        val job = context.job
+        val log = context.log
+        val repository = job.snapshotConfig["repository"] as String
+
+        return if (job.deletion?.snapshotPattern != null) {
+            try {
+                val patternSnapshots = client.getSnapshots(job.deletion.snapshotPattern, repository)
+                Pair(patternSnapshots, metadataBuilder)
+            } catch (ex: Exception) {
+                log.error("Caught exception while getting snapshots for pattern ${job.deletion.snapshotPattern}.", ex)
+                val updatedMetadataBuilder = metadataBuilder.setLatestExecution(
+                    status = SMMetadata.LatestExecution.Status.RETRYING,
+                    message = "Caught exception while getting snapshots for pattern ${job.deletion.snapshotPattern}.",
+                    cause = ex,
+                )
+                null
+            }
+        } else {
+            Pair(emptyList(), metadataBuilder)
+        }
+    }
+}

src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/model/SMMetadata.kt

@@ -510,6 +510,14 @@ data class SMMetadata(
             return this
         }
 
+        fun resetCreation(): Builder {
+            metadata =
+                metadata.copy(
+                    creation = null,
+                )
+            return this
+        }
+
         // Use this **first** to update metadata, because it depends on started field
         // So if you change started first, this could behave wrongly
         @Suppress("LongParameterList")