Implements RolloverAction with new interface, fixes default action re…

…try commit (#231) * Implements rollover action with new interface, fixes default action retry Signed-off-by: Clay Downs <[email protected]>
opensearch-project · Dec 21, 2021 · f8fc089 · f8fc089
1 parent e9b4212
commit f8fc089
Show file tree

Hide file tree

Showing 11 changed files with 365 additions and 52 deletions.
diff --git a/build.gradle b/build.gradle
@@ -307,7 +307,6 @@ integTest {
     exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/IndexStateManagementHistoryIT.class'
     exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/NotificationActionIT.class'
     exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/ReplicaCountActionIT.class'
-    exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/RolloverActionIT.class'
     exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/RollupActionIT.class'
     exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/SnapshotActionIT.class'
     exclude 'org/opensearch/indexmanagement/indexstatemanagement/action/TransitionActionIT.class'

diff --git a/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Action.kt b/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Action.kt
@@ -20,7 +20,7 @@ abstract class Action(
 ) : ToXContentObject, Writeable {
 
     var configTimeout: ActionTimeout? = null
-    var configRetry: ActionRetry? = null
+    var configRetry: ActionRetry? = ActionRetry(DEFAULT_RETRIES)
 
     final override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
         builder.startObject()
@@ -67,4 +67,8 @@ abstract class Action(
     final fun isLastStep(stepName: String): Boolean = getSteps().last().name == stepName
 
     final fun isFirstStep(stepName: String): Boolean = getSteps().first().name == stepName
+
+    companion object {
+        const val DEFAULT_RETRIES = 3L
+    }
 }
diff --git a/.../main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionRetry.kt b/.../main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionRetry.kt
@@ -26,7 +26,7 @@ data class ActionRetry(
     val delay: TimeValue = TimeValue.timeValueMinutes(1)
 ) : ToXContentFragment, Writeable {
 
-    init { require(count > 0) { "Count for ActionRetry must be greater than 0" } }
+    init { require(count >= 0) { "Count for ActionRetry must be a non-negative number" } }
 
     override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
         builder

diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ISMActionsParser.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ISMActionsParser.kt
@@ -13,6 +13,7 @@ import org.opensearch.indexmanagement.indexstatemanagement.action.DeleteActionPa
 import org.opensearch.indexmanagement.indexstatemanagement.action.OpenActionParser
 import org.opensearch.indexmanagement.indexstatemanagement.action.ReadOnlyActionParser
 import org.opensearch.indexmanagement.indexstatemanagement.action.ReadWriteActionParser
+import org.opensearch.indexmanagement.indexstatemanagement.action.RolloverActionParser
 import org.opensearch.indexmanagement.spi.indexstatemanagement.Action
 import org.opensearch.indexmanagement.spi.indexstatemanagement.ActionParser
 import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionRetry
@@ -30,7 +31,8 @@ class ISMActionsParser private constructor() {
         DeleteActionParser(),
         OpenActionParser(),
         ReadOnlyActionParser(),
-        ReadWriteActionParser()
+        ReadWriteActionParser(),
+        RolloverActionParser()
     )
 
     fun addParser(parser: ActionParser) {
@@ -53,7 +55,7 @@ class ISMActionsParser private constructor() {
     fun parse(xcp: XContentParser, totalActions: Int): Action {
         var action: Action? = null
         var timeout: ActionTimeout? = null
-        var retry: ActionRetry? = null
+        var retry: ActionRetry? = ActionRetry(Action.DEFAULT_RETRIES)
         XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp)
         while (xcp.nextToken() != XContentParser.Token.END_OBJECT) {
             val type = xcp.currentName()

diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/action/RolloverAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/action/RolloverAction.kt
@@ -5,8 +5,12 @@
 
 package org.opensearch.indexmanagement.indexstatemanagement.action
 
+import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.unit.ByteSizeValue
 import org.opensearch.common.unit.TimeValue
+import org.opensearch.common.xcontent.ToXContent
+import org.opensearch.common.xcontent.XContentBuilder
+import org.opensearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep
 import org.opensearch.indexmanagement.spi.indexstatemanagement.Action
 import org.opensearch.indexmanagement.spi.indexstatemanagement.Step
 import org.opensearch.indexmanagement.spi.indexstatemanagement.model.StepContext
@@ -18,12 +22,34 @@ class RolloverAction(
     index: Int
 ) : Action(name, index) {
 
+    init {
+        if (minSize != null) require(minSize.bytes > 0) { "RolloverAction minSize value must be greater than 0" }
+
+        if (minDocs != null) require(minDocs > 0) { "RolloverAction minDocs value must be greater than 0" }
+    }
+
+    private val attemptRolloverStep = AttemptRolloverStep(this)
+    private val steps = listOf(attemptRolloverStep)
+
     override fun getStepToExecute(context: StepContext): Step {
-        TODO("Not yet implemented")
+        return attemptRolloverStep
+    }
+
+    override fun getSteps(): List<Step> = steps
+
+    override fun populateAction(builder: XContentBuilder, params: ToXContent.Params) {
+        builder.startObject(type)
+        if (minSize != null) builder.field(MIN_SIZE_FIELD, minSize.stringRep)
+        if (minDocs != null) builder.field(MIN_DOC_COUNT_FIELD, minDocs)
+        if (minAge != null) builder.field(MIN_INDEX_AGE_FIELD, minAge.stringRep)
+        builder.endObject()
     }
 
-    override fun getSteps(): List<Step> {
-        TODO("Not yet implemented")
+    override fun populateAction(out: StreamOutput) {
+        out.writeOptionalWriteable(minSize)
+        out.writeOptionalLong(minDocs)
+        out.writeOptionalTimeValue(minAge)
+        out.writeInt(actionIndex)
     }
 
     companion object {

diff --git a/...kotlin/org/opensearch/indexmanagement/indexstatemanagement/action/RolloverActionParser.kt b/...kotlin/org/opensearch/indexmanagement/indexstatemanagement/action/RolloverActionParser.kt
@@ -6,20 +6,45 @@
 package org.opensearch.indexmanagement.indexstatemanagement.action
 
 import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.common.unit.ByteSizeValue
+import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.XContentParser
+import org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken
 import org.opensearch.indexmanagement.spi.indexstatemanagement.Action
 import org.opensearch.indexmanagement.spi.indexstatemanagement.ActionParser
 
 class RolloverActionParser : ActionParser() {
     override fun fromStreamInput(sin: StreamInput): Action {
-        TODO("Not yet implemented")
+        val minSize = sin.readOptionalWriteable(::ByteSizeValue)
+        val minDocs = sin.readOptionalLong()
+        val minAge = sin.readOptionalTimeValue()
+        val index = sin.readInt()
+
+        return RolloverAction(minSize, minDocs, minAge, index)
     }
 
     override fun fromXContent(xcp: XContentParser, index: Int): Action {
-        TODO("Not yet implemented")
+        var minSize: ByteSizeValue? = null
+        var minDocs: Long? = null
+        var minAge: TimeValue? = null
+
+        ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp)
+        while (xcp.nextToken() != XContentParser.Token.END_OBJECT) {
+            val fieldName = xcp.currentName()
+            xcp.nextToken()
+
+            when (fieldName) {
+                RolloverAction.MIN_SIZE_FIELD -> minSize = ByteSizeValue.parseBytesSizeValue(xcp.text(), RolloverAction.MIN_SIZE_FIELD)
+                RolloverAction.MIN_DOC_COUNT_FIELD -> minDocs = xcp.longValue()
+                RolloverAction.MIN_INDEX_AGE_FIELD -> minAge = TimeValue.parseTimeValue(xcp.text(), RolloverAction.MIN_INDEX_AGE_FIELD)
+                else -> throw IllegalArgumentException("Invalid field: [$fieldName] found in RolloverAction.")
+            }
+        }
+
+        return RolloverAction(minSize, minDocs, minAge, index)
     }
 
     override fun getActionType(): String {
-        TODO("Not yet implemented")
+        return RolloverAction.name
     }
 }