Skip to content

Commit

Permalink
fix the race condition in test reset action start time (opensearch-pr…
Browse files Browse the repository at this point in the history
…oject#1007)

Signed-off-by: bowenlan-amzn <[email protected]>
  • Loading branch information
bowenlan-amzn authored and Joshua152 committed Dec 22, 2023
1 parent 87af02e commit b46d4ff
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedInde
import org.opensearch.indexmanagement.waitFor
import org.opensearch.rest.RestRequest
import org.opensearch.core.rest.RestStatus
import org.opensearch.indexmanagement.indexstatemanagement.step.forcemerge.AttemptSetReadOnlyStep
import java.time.Instant
import java.util.Locale

Expand Down Expand Up @@ -257,20 +258,19 @@ class RestRetryFailedManagedIndexActionIT : IndexStateManagementRestTestCase() {
val action = randomForceMergeActionConfig(maxNumSegments = 1)
action.configRetry = ActionRetry(0)
val policy = randomPolicy(states = listOf(randomState(actions = listOf(action))))

createPolicy(policy, policyId = policyID)
createIndex(indexName, policyID)

val managedIndexConfig = getExistingManagedIndexConfig(indexName)

// init policy on job
updateManagedIndexConfigStartTime(managedIndexConfig)

// verify we have policy
waitFor { assertEquals(policyID, getExplainManagedIndexMetaData(indexName).policyID) }

// speed up to execute set read only force merge step
updateManagedIndexConfigStartTime(managedIndexConfig)

waitFor {
val explainMap = getExplainMap(indexName)

Expand All @@ -295,7 +295,6 @@ class RestRetryFailedManagedIndexActionIT : IndexStateManagementRestTestCase() {

// speed up to execute attempt call force merge step
updateManagedIndexConfigStartTime(managedIndexConfig)

// verify failed and save the startTime
var firstStartTime: Long = Long.MAX_VALUE
waitFor {
Expand Down Expand Up @@ -332,7 +331,6 @@ class RestRetryFailedManagedIndexActionIT : IndexStateManagementRestTestCase() {
FAILED_INDICES to emptyList<Map<String, Any>>()
)
assertAffectedIndicesResponseIsEqual(expectedErrorMessage, response.asMap())

// verify actionStartTime was reset to null
assertPredicatesOnMetaData(
listOf(
Expand All @@ -349,7 +347,6 @@ class RestRetryFailedManagedIndexActionIT : IndexStateManagementRestTestCase() {

// should execute and set the startTime again
updateManagedIndexConfigStartTime(managedIndexConfig)

// the new startTime should be greater than the first start time
waitFor {
assertPredicatesOnMetaData(
Expand All @@ -364,6 +361,10 @@ class RestRetryFailedManagedIndexActionIT : IndexStateManagementRestTestCase() {
),
getExplainMap(indexName), false
)
assertEquals(
AttemptSetReadOnlyStep.getSuccessMessage(indexName),
getExplainManagedIndexMetaData(indexName).info?.get("message")
)
}
}
}

0 comments on commit b46d4ff

Please sign in to comment.