Fixing snapshot bug

Signed-off-by: Kshitij Tandon <tandonks@amazon.com>
opensearch-project · Sep 14, 2024 · e929e87 · e929e87
1 parent 395317d
commit e929e87
Showing 1 changed file with 22 additions and 25 deletions.
diff --git a/.../org/opensearch/indexmanagement/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt b/.../org/opensearch/indexmanagement/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt
@@ -7,16 +7,16 @@ package org.opensearch.indexmanagement.indexstatemanagement.step.snapshot
 
 import org.apache.logging.log4j.LogManager
 import org.opensearch.ExceptionsHelper
-import org.opensearch.action.admin.cluster.snapshots.status.SnapshotStatus
-import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest
-import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse
-import org.opensearch.cluster.SnapshotsInProgress.State
+import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest
+import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse
 import org.opensearch.indexmanagement.indexstatemanagement.action.SnapshotAction
 import org.opensearch.indexmanagement.opensearchapi.suspendUntil
 import org.opensearch.indexmanagement.spi.indexstatemanagement.Step
 import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionProperties
 import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData
 import org.opensearch.indexmanagement.spi.indexstatemanagement.model.StepMetaData
+import org.opensearch.snapshots.SnapshotInfo
+import org.opensearch.snapshots.SnapshotState
 import org.opensearch.transport.RemoteTransportException
 
 class WaitForSnapshotStep(private val action: SnapshotAction) : Step(name) {
@@ -33,32 +33,31 @@ class WaitForSnapshotStep(private val action: SnapshotAction) : Step(name) {
 
         try {
             val snapshotName = getSnapshotName(managedIndexMetadata, indexName) ?: return this
-            val request =
-                SnapshotsStatusRequest()
-                    .snapshots(arrayOf(snapshotName))
-                    .repository(repository)
-            val response: SnapshotsStatusResponse = context.client.admin().cluster().suspendUntil { snapshotsStatus(request, it) }
-            val status: SnapshotStatus? =
+            val newRequest = GetSnapshotsRequest()
+                .snapshots(arrayOf(snapshotName))
+                .repository(repository)
+            val response: GetSnapshotsResponse = context.client.admin().cluster().suspendUntil { getSnapshots(newRequest, it) }
+            val status: SnapshotInfo? =
                 response
                     .snapshots
-                    .find { snapshotStatus ->
-                        snapshotStatus.snapshot.snapshotId.name == snapshotName && snapshotStatus.snapshot.repository == repository
+                    .find { snapshotInfo ->
+                        snapshotInfo.snapshotId().name == snapshotName
                     }
             if (status != null) {
-                when (status.state) {
-                    State.INIT, State.STARTED -> {
+                when (status.state()) {
+                    SnapshotState.IN_PROGRESS -> {
                         stepStatus = StepStatus.CONDITION_NOT_MET
-                        info = mapOf("message" to getSnapshotInProgressMessage(indexName), "state" to status.state.name)
+                        info = mapOf("message" to getSnapshotInProgressMessage(indexName), "state" to status.state().toString())
                     }
-                    State.SUCCESS -> {
+                    SnapshotState.SUCCESS -> {
                         stepStatus = StepStatus.COMPLETED
-                        info = mapOf("message" to getSuccessMessage(indexName), "state" to status.state.name)
+                        info = mapOf("message" to getSuccessMessage(indexName), "state" to status.state().toString())
                     }
                     else -> { // State.FAILED, State.ABORTED
                         val message = getFailedExistsMessage(indexName)
                         logger.warn(message)
                         stepStatus = StepStatus.FAILED
-                        info = mapOf("message" to message, "state" to status.state.name)
+                        info = mapOf("message" to message, "state" to status.stWate().toString())
                     }
                 }
             } else {
@@ -98,13 +97,11 @@ class WaitForSnapshotStep(private val action: SnapshotAction) : Step(name) {
         return actionProperties.snapshotName
     }
 
-    override fun getUpdatedManagedIndexMetadata(currentMetadata: ManagedIndexMetaData): ManagedIndexMetaData {
-        return currentMetadata.copy(
-            stepMetaData = StepMetaData(name, getStepStartTime(currentMetadata).toEpochMilli(), stepStatus),
-            transitionTo = null,
-            info = info,
-        )
-    }
+    override fun getUpdatedManagedIndexMetadata(currentMetadata: ManagedIndexMetaData): ManagedIndexMetaData = currentMetadata.copy(
+        stepMetaData = StepMetaData(name, getStepStartTime(currentMetadata).toEpochMilli(), stepStatus),
+        transitionTo = null,
+        info = info,
+    )
 
     override fun isIdempotent(): Boolean = true