From 2dbe660cebe9e01a9052129883742416aa7e71c3 Mon Sep 17 00:00:00 2001 From: Bowen Lan <62091230+bowenlan-amzn@users.noreply.github.com> Date: Thu, 22 Oct 2020 11:15:45 -0700 Subject: [PATCH] skip RefreshSearchAnalyzerActionIT for Infra IT (#315) * address comment some writting changes just for consistency with AES side --- .../step/forcemerge/AttemptSetReadOnlyStep.kt | 4 +--- .../indexmanagement/IndexManagementIndicesIT.kt | 2 +- .../indexmanagement/IndexManagementRestTestCase.kt | 5 +++++ .../indexstatemanagement/runner/ManagedIndexRunnerIT.kt | 3 ++- .../refreshanalyzer/RefreshSearchAnalyzerActionIT.kt | 8 ++++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt index 46c8b267a..6852fc500 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt @@ -61,9 +61,7 @@ class AttemptSetReadOnlyStep( try { val updateSettingsRequest = UpdateSettingsRequest() .indices(indexName) - .settings( - Settings.builder().put(SETTING_BLOCKS_WRITE, true) - ) + .settings(Settings.builder().put(SETTING_BLOCKS_WRITE, true)) val response: AcknowledgedResponse = client.admin().indices() .suspendUntil { updateSettings(updateSettingsRequest, it) } diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndicesIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndicesIT.kt index fa293c137..8d7d304ae 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndicesIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndicesIT.kt @@ -135,4 +135,4 @@ class IndexManagementIndicesIT : IndexStateManagementRestTestCase() { waitFor { assertEquals(newPolicy.id, getManagedIndexConfig(index)?.changePolicy?.policyID) } } -} \ No newline at end of file +} diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementRestTestCase.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementRestTestCase.kt index 23ca5b62c..be0b0ac06 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementRestTestCase.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementRestTestCase.kt @@ -21,6 +21,11 @@ import org.elasticsearch.test.rest.ESRestTestCase abstract class IndexManagementRestTestCase : ESRestTestCase() { + protected val isLocalTest = clusterName() == "integTest" + private fun clusterName(): String { + return System.getProperty("tests.clustername") + } + fun Response.asMap(): Map = entityAsMap(this) protected fun Response.restStatus(): RestStatus = RestStatus.fromCode(this.statusLine.statusCode) diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt index c5173c82d..f478ca5bd 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt @@ -99,7 +99,8 @@ class ManagedIndexRunnerIT : IndexStateManagementRestTestCase() { val managedIndexConfig = getExistingManagedIndexConfig(indexName) - assertEquals("Created managed index did not default to 5 minutes", 5, (managedIndexConfig.jobSchedule as IntervalSchedule).interval) + assertEquals("Created managed index did not default to ${ManagedIndexSettings.DEFAULT_JOB_INTERVAL}minutes", + ManagedIndexSettings.DEFAULT_JOB_INTERVAL, (managedIndexConfig.jobSchedule as IntervalSchedule).interval) // init policy updateManagedIndexConfigStartTime(managedIndexConfig) diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt index 2edba47f1..f194ba8c9 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt @@ -21,12 +21,20 @@ import org.elasticsearch.client.Request import org.elasticsearch.common.io.Streams import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.xcontent.XContentType +import org.junit.Assume +import org.junit.Before import java.io.InputStreamReader import java.nio.charset.Charset import java.nio.charset.StandardCharsets import java.nio.file.Files class RefreshSearchAnalyzerActionIT : IndexManagementRestTestCase() { + + @Before + fun checkIfLocalCluster() { + Assume.assumeTrue(isLocalTest) + } + fun `test index time analyzer`() { val buildDir = System.getProperty("buildDir") val numNodes = System.getProperty("cluster.number_of_nodes", "1").toInt()