clean up

opensearch-project · Aug 18, 2022 · 32b2f78 · 32b2f78
1 parent 2f2fd2d
commit 32b2f78
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt
@@ -409,12 +409,12 @@ object ManagedIndexRunner :
             if (validationServiceEnabled) {
                 val validationResult = validationService.validate(action.type, stepContext.metadata.index)
                 if (validationResult.validationStatus == Validate.ValidationStatus.RE_VALIDATING) {
-                    logger.info("Revalidate")
+                    logger.warn("Validation Status is: RE_VALIDATING")
                     publishErrorNotification(policy, managedIndexMetaData)
                     return
                 }
                 if (validationResult.validationStatus == Validate.ValidationStatus.FAILED) {
-                    logger.info("Fail forever")
+                    logger.warn("Validation Status is: FAILED")
                     publishErrorNotification(policy, managedIndexMetaData)
                     disableManagedIndexConfig(managedIndexConfig)
                     return

diff --git a/...h/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt b/...h/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt
@@ -344,9 +344,6 @@ class TransportExplainAction @Inject constructor(
                         val state = policy.getStateToExecute(managedIndexMetadata!!)
                         val action = state?.getActionToExecute(managedIndexMetadata!!, indexMetadataProvider)
                         var actionName = action?.type
-                        log.info("Inside Explain API")
-                        log.info("Next Action")
-                        log.info(actionName)
                         if (actionName == null) {
                             actionName = "nothing"
                         }

diff --git a/...tlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateForceMerge.kt b/...tlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateForceMerge.kt
@@ -24,7 +24,6 @@ class ValidateForceMerge(
 
     @Suppress("ReturnSuppressCount", "ReturnCount")
     override fun execute(indexName: String): Validate {
-        logger.info("inside force merge")
         if (!dataSizeNotLarge(indexName)) {
             return this
         }

diff --git a/...kotlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateRollover.kt b/...kotlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateRollover.kt
@@ -26,7 +26,6 @@ class ValidateRollover(
     // returns a Validate object with updated validation and step status
     @Suppress("ReturnSuppressCount", "ReturnCount")
     override fun execute(indexName: String): Validate {
-        logger.info("inside rollover")
         val (rolloverTarget, isDataStream) = getRolloverTargetOrUpdateInfo(indexName)
         rolloverTarget ?: return this
 

diff --git a/...tlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateRolloverIT.kt b/...tlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateRolloverIT.kt
@@ -24,8 +24,6 @@ import java.time.temporal.ChronoUnit
 import java.util.Locale
 
 class ValidateRolloverIT : IndexStateManagementRestTestCase() {
-    // check test case for no rollover alias (without datastream)
-
     private val testIndexName = javaClass.simpleName.lowercase(Locale.ROOT)
 
     // status: PASSED

diff --git a/worksheets/ism/delete.http b/worksheets/ism/delete.http
@@ -1,4 +1,4 @@
-###
+### delete policy
 PUT localhost:9200/_opendistro/_ism/policies/exampledelete
 Content-Type: application/json
 
@@ -24,10 +24,10 @@ Content-Type: application/json
   }
 }
 
-###
+### delete index
 PUT http://localhost:9200/testdelete
 Content-Type: application/json
 
-###
-GET localhost:9200/_plugins/_ism/explain/testdelete?pretty
+### explain api call
+GET localhost:9200/_plugins/_ism/explain/testdelete?validate_action=true
 Accept: application/json
diff --git a/worksheets/ism/rollover.http b/worksheets/ism/rollover.http
@@ -75,7 +75,7 @@ PUT http://localhost:9200/testnoalias
 Content-Type: application/json
 
 ### explain API
-GET localhost:9200/_plugins/_ism/explain/testnoalias?validate_action=false
+GET localhost:9200/_plugins/_ism/explain/testnoalias?validate_action=true
 Accept: application/json
 
 ### delete index
@@ -119,11 +119,11 @@ Content-Type: application/json
 }
 
 ### call explain API
-GET localhost:9200/_plugins/_ism/explain/log-000002?pretty
+GET localhost:9200/_plugins/_ism/explain/log-000002?validate_action=true
 Accept: application/json
 
 ### call explain API
-GET localhost:9200/_plugins/_ism/explain/log-000003?pretty
+GET localhost:9200/_plugins/_ism/explain/log-000003?validate_action=true
 Accept: application/json
 
 ### delete index