One IT for overall workflow

Signed-off-by: bowenlan-amzn <[email protected]>
opensearch-project · Jun 13, 2022 · 2caa004 · 2caa004
1 parent baf4fab
commit 2caa004
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 27 deletions.
diff --git a/src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMRunner.kt b/src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMRunner.kt
@@ -14,7 +14,7 @@ import org.apache.logging.log4j.LogManager
 import org.opensearch.action.bulk.BackoffPolicy
 import org.opensearch.client.Client
 import org.opensearch.common.unit.TimeValue
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.engine.states.SMState
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMPolicy
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata

diff --git a/...anagement/engine/states/SMStateMachine.kt → ...apshotmanagement/engine/SMStateMachine.kt b/...anagement/engine/states/SMStateMachine.kt → ...apshotmanagement/engine/SMStateMachine.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine
+package org.opensearch.indexmanagement.snapshotmanagement.engine
 
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger

diff --git a/...rg/opensearch/indexmanagement/snapshotmanagement/engine/states/CreateConditionMetState.kt b/...rg/opensearch/indexmanagement/snapshotmanagement/engine/states/CreateConditionMetState.kt
@@ -5,7 +5,7 @@
 
 package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.updateNextExecutionTime
 

diff --git a/...n/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/CreatingState.kt b/...n/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/CreatingState.kt
@@ -9,7 +9,7 @@ import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotReques
 import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse
 import org.opensearch.indexmanagement.opensearchapi.suspendUntil
 import org.opensearch.indexmanagement.snapshotmanagement.SnapshotManagementException
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.generateSnapshotName
 import org.opensearch.indexmanagement.snapshotmanagement.addSMPolicyInSnapshotMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.getSnapshotsWithErrorHandling

diff --git a/...rg/opensearch/indexmanagement/snapshotmanagement/engine/states/DeleteConditionMetState.kt b/...rg/opensearch/indexmanagement/snapshotmanagement/engine/states/DeleteConditionMetState.kt
@@ -5,7 +5,7 @@
 
 package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.updateNextExecutionTime
 import java.time.Instant.now

diff --git a/...n/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/DeletingState.kt b/...n/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/DeletingState.kt
@@ -10,7 +10,7 @@ import org.opensearch.action.admin.cluster.snapshots.delete.DeleteSnapshotReques
 import org.opensearch.action.support.master.AcknowledgedResponse
 import org.opensearch.indexmanagement.opensearchapi.suspendUntil
 import org.opensearch.indexmanagement.snapshotmanagement.SnapshotManagementException
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.getSnapshotsWithErrorHandling
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMPolicy

diff --git a/...n/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/FinishedState.kt b/...n/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/FinishedState.kt
@@ -6,7 +6,7 @@
 package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
 import org.opensearch.common.unit.TimeValue
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.getSnapshotsWithErrorHandling
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.smDocIdToPolicyName

diff --git a/...main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/StartState.kt b/...main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/StartState.kt
@@ -5,7 +5,7 @@
 
 package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.model.SMMetadata
 
 object StartState : State {

diff --git a/src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/State.kt b/src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/State.kt
@@ -5,7 +5,7 @@
 
 package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.jobscheduler.spi.ScheduledJobParameter
 
 /**

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMRunnerIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMRunnerIT.kt
@@ -12,7 +12,7 @@ import org.opensearch.indexmanagement.waitFor
 import org.opensearch.jobscheduler.spi.schedule.CronSchedule
 import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule
 import org.opensearch.rest.RestStatus
-import java.time.Instant
+import java.time.Instant.now
 import java.time.temporal.ChronoUnit
 
 class SMRunnerIT : SnapshotManagementRestTestCase() {
@@ -22,32 +22,36 @@ class SMRunnerIT : SnapshotManagementRestTestCase() {
 
         val smPolicy = randomSMPolicy(
             creationSchedule = CronSchedule("* * * * *", randomZone()),
-            jobSchedule = IntervalSchedule(Instant.now(), 1, ChronoUnit.MINUTES),
+            jobSchedule = IntervalSchedule(now(), 1, ChronoUnit.MINUTES),
             jobEnabled = true,
+            jobEnabledTime = now(),
         )
         val policyName = smPolicy.policyName
         val response = client().makeRequest("POST", "$SM_POLICIES_URI/$policyName", emptyMap(), smPolicy.toHttpEntity())
         assertEquals("Create SM policy failed", RestStatus.CREATED, response.restStatus())
 
+        // Initialization
         updateSMPolicyStartTime(smPolicy)
         waitFor {
-            val explainMetadata = parseExplainResponse(explainSMPolicy(policyName).entity.content)
+            val explainMetadata = parseExplainResponse(explainSMPolicy(policyName).entity.content).first()
             assertNotNull(explainMetadata.creation!!.trigger.time)
         }
 
         // Wait for cron schedule to meet
-        Thread.sleep(41_000L)
+        Thread.sleep(60_000L)
 
+        // Create condition met
         updateSMPolicyStartTime(smPolicy)
         waitFor {
-            val explainMetadata = parseExplainResponse(explainSMPolicy(policyName).entity.content)
+            val explainMetadata = parseExplainResponse(explainSMPolicy(policyName).entity.content).first()
             assertNotNull(explainMetadata.creation!!.started)
             assertEquals(SMMetadata.LatestExecution.Status.IN_PROGRESS, explainMetadata.creation.latestExecution!!.status)
         }
 
+        // Snapshot has been created successfully
         updateSMPolicyStartTime(smPolicy)
         waitFor {
-            val explainMetadata = parseExplainResponse(explainSMPolicy(policyName).entity.content)
+            val explainMetadata = parseExplainResponse(explainSMPolicy(policyName).entity.content).first()
             assertNull(explainMetadata.creation!!.started)
             assertEquals(SMMetadata.LatestExecution.Status.SUCCESS, explainMetadata.creation.latestExecution!!.status)
         }

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMUtilsTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMUtilsTests.kt
@@ -31,7 +31,6 @@ class SMUtilsTests : OpenSearchTestCase() {
         val metadata = randomSMMetadata()
         val policiesToExplain: Map<String, ExplainSMPolicy?> = mapOf("policyName" to ExplainSMPolicy(metadata, true))
         val response = ExplainSMPolicyResponse(policiesToExplain)
-        println("SIN $policiesToExplain")
         val out = BytesStreamOutput().also { response.writeTo(it) }
         val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
         // parseSMMetadata(sin)

diff --git a/...otlin/org/opensearch/indexmanagement/snapshotmanagement/SnapshotManagementRestTestCase.kt b/...otlin/org/opensearch/indexmanagement/snapshotmanagement/SnapshotManagementRestTestCase.kt
@@ -129,10 +129,10 @@ abstract class SnapshotManagementRestTestCase : IndexManagementRestTestCase() {
         assertEquals("Request failed", RestStatus.OK, response.restStatus())
     }
 
-    fun parseExplainResponse(inputStream: InputStream): ExplainSMMetadata {
+    fun parseExplainResponse(inputStream: InputStream): List<ExplainSMMetadata> {
         val parser = createParser(XContentType.JSON.xContent(), inputStream)
         // val parser = createParser(builder)
-        lateinit var smMetadata: ExplainSMMetadata
+        val smMetadata: MutableList<ExplainSMMetadata> = mutableListOf()
 
         // while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
         //     println("currentToken ${parser.currentToken()} ${parser.currentName()}")
@@ -142,11 +142,10 @@ abstract class SnapshotManagementRestTestCase : IndexManagementRestTestCase() {
         ensureExpectedToken(XContentParser.Token.FIELD_NAME, parser.nextToken(), parser) // policies
         ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.nextToken(), parser)
         while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
-            ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser)
-            smMetadata = ExplainSMMetadata.parse(parser)
+            smMetadata.add(ExplainSMMetadata.parse(parser))
         }
 
-        println("${now()}: sm metadata $smMetadata")
+        logger.info("${now()}: sm metadata $smMetadata")
         return smMetadata
     }
 

diff --git a/.../opensearch/indexmanagement/snapshotmanagement/engine/statemachine/SMStateMachineTests.kt b/.../opensearch/indexmanagement/snapshotmanagement/engine/statemachine/SMStateMachineTests.kt
@@ -12,6 +12,7 @@ import com.nhaarman.mockitokotlin2.verify
 import kotlinx.coroutines.runBlocking
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.indexmanagement.ClientMockTestCase
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.engine.states.SMState
 import org.opensearch.indexmanagement.snapshotmanagement.engine.states.smTransitions
 import org.opensearch.indexmanagement.snapshotmanagement.mockGetSnapshotResponse

diff --git a/...ensearch/indexmanagement/snapshotmanagement/engine/states/CreateConditionMetStateTests.kt b/...ensearch/indexmanagement/snapshotmanagement/engine/states/CreateConditionMetStateTests.kt
@@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
 import kotlinx.coroutines.runBlocking
 import org.opensearch.indexmanagement.ClientMockTestCase
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMPolicy
 import org.opensearch.indexmanagement.snapshotmanagement.randomSnapshotName

diff --git a/...lin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/CreatingStateTests.kt b/...lin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/CreatingStateTests.kt
@@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
 import kotlinx.coroutines.runBlocking
 import org.opensearch.indexmanagement.ClientMockTestCase
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMPolicy
 import org.opensearch.indexmanagement.snapshotmanagement.mockCreateSnapshotResponse

diff --git a/...ensearch/indexmanagement/snapshotmanagement/engine/states/DeleteConditionMetStateTests.kt b/...ensearch/indexmanagement/snapshotmanagement/engine/states/DeleteConditionMetStateTests.kt
@@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
 import kotlinx.coroutines.runBlocking
 import org.opensearch.indexmanagement.ClientMockTestCase
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMPolicy
 import org.opensearch.indexmanagement.snapshotmanagement.randomSnapshotName

diff --git a/...lin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/DeletingStateTests.kt b/...lin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/DeletingStateTests.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.runBlocking
 import org.opensearch.action.support.master.AcknowledgedResponse
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.indexmanagement.ClientMockTestCase
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.mockGetSnapshotResponse
 import org.opensearch.indexmanagement.snapshotmanagement.mockGetSnapshotsResponse
 import org.opensearch.indexmanagement.snapshotmanagement.mockSnapshotInfo

diff --git a/...lin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/FinishedStateTests.kt b/...lin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/FinishedStateTests.kt
@@ -8,7 +8,7 @@ package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 import kotlinx.coroutines.runBlocking
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.indexmanagement.ClientMockTestCase
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.mockGetSnapshotResponse
 import org.opensearch.indexmanagement.snapshotmanagement.mockInProgressSnapshotInfo
 import org.opensearch.indexmanagement.snapshotmanagement.mockSnapshotInfo

diff --git a/...kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/StartStateTests.kt b/...kotlin/org/opensearch/indexmanagement/snapshotmanagement/engine/states/StartStateTests.kt
@@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.snapshotmanagement.engine.states
 
 import kotlinx.coroutines.runBlocking
 import org.opensearch.indexmanagement.ClientMockTestCase
-import org.opensearch.indexmanagement.snapshotmanagement.engine.statemachine.SMStateMachine
+import org.opensearch.indexmanagement.snapshotmanagement.engine.SMStateMachine
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMMetadata
 import org.opensearch.indexmanagement.snapshotmanagement.randomSMPolicy