This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport bug fixes/improvements to opendistro-1.1 (#136)
* Make rollover condition distinct and change ManagedIndexConfig to use PolicySeqNo and PolicyPrimaryTerm (#121) * Make rollover condition distinct and change ManagedIndexConfig to use PolicySeqNo and PolicyPrimaryTerm * add rollover test case for no condition * remove 'which' in the comment * Adds null check in cluster changed event sweep (#125) * Fixes history index iteration breaking instead of continuing (#134) * Fixes issue where action timeout was using start_time from previous action (#133) * Removes transitive dependencies for notification (#105) * Removes transitive dependencies for notification * Removes resolution strategy for removed transient dependencies and adds excludes for testCompile because of jarHell w/ elasticsearch.test:framework * Remove excludes in test dependencies (#108) * Updates plugin version and notification dependency * Updates test resources Co-authored-by: Jinsoo <[email protected]>
- Loading branch information
1 parent
39f46bf
commit becd31a
Showing
9 changed files
with
256 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
177 changes: 177 additions & 0 deletions
177
...lin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverActionIT.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| /* | ||
| * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.indexstatemanagement.action | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor | ||
| import org.apache.http.entity.ContentType | ||
| import org.apache.http.entity.StringEntity | ||
| import org.elasticsearch.common.unit.ByteSizeUnit | ||
| import org.elasticsearch.common.unit.ByteSizeValue | ||
| import org.elasticsearch.rest.RestRequest | ||
| import org.junit.Assert | ||
| import java.time.Instant | ||
| import java.time.temporal.ChronoUnit | ||
| import java.util.Locale | ||
|
|
||
| class RolloverActionIT : IndexStateManagementRestTestCase() { | ||
|
|
||
| private val testIndexName = javaClass.simpleName.toLowerCase(Locale.ROOT) | ||
|
|
||
| fun `test rollover no condition`() { | ||
| val aliasName = "${testIndexName}_alias" | ||
| val indexNameBase = "${testIndexName}_index" | ||
| val firstIndex = "$indexNameBase-1" | ||
| val policyID = "${testIndexName}_testPolicyName_1" | ||
| val actionConfig = RolloverActionConfig(null, null, null, 0) | ||
| val states = listOf(State(name = "RolloverAction", actions = listOf(actionConfig), transitions = listOf())) | ||
| val policy = Policy( | ||
| id = policyID, | ||
| description = "$testIndexName description", | ||
| schemaVersion = 1L, | ||
| lastUpdatedTime = Instant.now().truncatedTo(ChronoUnit.MILLIS), | ||
| errorNotification = randomErrorNotification(), | ||
| defaultState = states[0].name, | ||
| states = states | ||
| ) | ||
|
|
||
| createPolicy(policy, policyID) | ||
| // create index defaults | ||
| createIndex(firstIndex, policyID, aliasName) | ||
|
|
||
| val managedIndexConfig = getExistingManagedIndexConfig(firstIndex) | ||
|
|
||
| // Change the start time so the job will trigger in 2 seconds, this will trigger the first initialization of the policy | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals(policyID, getExplainManagedIndexMetaData(firstIndex).policyID) } | ||
|
|
||
| // Need to speed up to second execution where it will trigger the first execution of the action | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals("Index did not rollover.", mapOf("message" to "Rolled over index"), getExplainManagedIndexMetaData(firstIndex).info) } | ||
| Assert.assertTrue("New rollover index does not exist.", indexExists("$indexNameBase-000002")) | ||
| } | ||
|
|
||
| fun `test rollover multi condition byte size`() { | ||
| val aliasName = "${testIndexName}_byte_alias" | ||
| val indexNameBase = "${testIndexName}_index_byte" | ||
| val firstIndex = "$indexNameBase-1" | ||
| val policyID = "${testIndexName}_testPolicyName_byte_1" | ||
| val actionConfig = RolloverActionConfig(ByteSizeValue(10, ByteSizeUnit.BYTES), 1000000, null, 0) | ||
| val states = listOf(State(name = "RolloverAction", actions = listOf(actionConfig), transitions = listOf())) | ||
| val policy = Policy( | ||
| id = policyID, | ||
| description = "$testIndexName description", | ||
| schemaVersion = 1L, | ||
| lastUpdatedTime = Instant.now().truncatedTo(ChronoUnit.MILLIS), | ||
| errorNotification = randomErrorNotification(), | ||
| defaultState = states[0].name, | ||
| states = states | ||
| ) | ||
|
|
||
| createPolicy(policy, policyID) | ||
| // create index defaults | ||
| createIndex(firstIndex, policyID, aliasName) | ||
|
|
||
| val managedIndexConfig = getExistingManagedIndexConfig(firstIndex) | ||
|
|
||
| // Change the start time so the job will trigger in 2 seconds, this will trigger the first initialization of the policy | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals(policyID, getExplainManagedIndexMetaData(firstIndex).policyID) } | ||
|
|
||
| // Need to speed up to second execution where it will trigger the first execution of the action | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals("Index rollover before it met the condition.", mapOf("message" to "Attempting to rollover"), getExplainManagedIndexMetaData(firstIndex).info) } | ||
|
|
||
| client().makeRequest( | ||
| RestRequest.Method.PUT.toString(), | ||
| "$firstIndex/_doc/1111", | ||
| StringEntity("{ \"testkey\": \"some valueaaaaaaa\" }", ContentType.APPLICATION_JSON) | ||
| ) | ||
| client().makeRequest( | ||
| RestRequest.Method.PUT.toString(), | ||
| "$firstIndex/_doc/2222", | ||
| StringEntity("{ \"testkey1\": \"some value1\" }", ContentType.APPLICATION_JSON) | ||
| ) | ||
| client().makeRequest( | ||
| RestRequest.Method.PUT.toString(), | ||
| "$firstIndex/_doc/3333", | ||
| StringEntity("{ \"testkey2\": \"some value2\" }", ContentType.APPLICATION_JSON) | ||
| ) | ||
|
|
||
| // Need to speed up to second execution where it will trigger the first execution of the action | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals("Index did not rollover.", mapOf("message" to "Rolled over index"), getExplainManagedIndexMetaData(firstIndex).info) } | ||
| Assert.assertTrue("New rollover index does not exist.", indexExists("$indexNameBase-000002")) | ||
| } | ||
|
|
||
| fun `test rollover multi condition doc size`() { | ||
| val aliasName = "${testIndexName}_doc_alias" | ||
| val indexNameBase = "${testIndexName}_index_doc" | ||
| val firstIndex = "$indexNameBase-1" | ||
| val policyID = "${testIndexName}_testPolicyName_doc_1" | ||
| val actionConfig = RolloverActionConfig(ByteSizeValue(10, ByteSizeUnit.TB), 3, null, 0) | ||
| val states = listOf(State(name = "RolloverAction", actions = listOf(actionConfig), transitions = listOf())) | ||
| val policy = Policy( | ||
| id = policyID, | ||
| description = "$testIndexName description", | ||
| schemaVersion = 1L, | ||
| lastUpdatedTime = Instant.now().truncatedTo(ChronoUnit.MILLIS), | ||
| errorNotification = randomErrorNotification(), | ||
| defaultState = states[0].name, | ||
| states = states | ||
| ) | ||
|
|
||
| createPolicy(policy, policyID) | ||
| // create index defaults | ||
| createIndex(firstIndex, policyID, aliasName) | ||
|
|
||
| val managedIndexConfig = getExistingManagedIndexConfig(firstIndex) | ||
|
|
||
| // Change the start time so the job will trigger in 2 seconds, this will trigger the first initialization of the policy | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals(policyID, getExplainManagedIndexMetaData(firstIndex).policyID) } | ||
|
|
||
| // Need to speed up to second execution where it will trigger the first execution of the action | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals("Index rollover before it met the condition.", mapOf("message" to "Attempting to rollover"), getExplainManagedIndexMetaData(firstIndex).info) } | ||
|
|
||
| client().makeRequest( | ||
| RestRequest.Method.PUT.toString(), | ||
| "$firstIndex/_doc/1111", | ||
| StringEntity("{ \"testkey\": \"some value\" }", ContentType.APPLICATION_JSON) | ||
| ) | ||
| client().makeRequest( | ||
| RestRequest.Method.PUT.toString(), | ||
| "$firstIndex/_doc/2222", | ||
| StringEntity("{ \"testkey1\": \"some value1\" }", ContentType.APPLICATION_JSON) | ||
| ) | ||
| client().makeRequest( | ||
| RestRequest.Method.PUT.toString(), | ||
| "$firstIndex/_doc/3333", | ||
| StringEntity("{ \"testkey2\": \"some value2\" }", ContentType.APPLICATION_JSON) | ||
| ) | ||
|
|
||
| // Need to speed up to second execution where it will trigger the first execution of the action | ||
| updateManagedIndexConfigStartTime(managedIndexConfig) | ||
| waitFor { assertEquals("Index did not rollover.", mapOf("message" to "Rolled over index"), getExplainManagedIndexMetaData(firstIndex).info) } | ||
| Assert.assertTrue("New rollover index does not exist.", indexExists("$indexNameBase-000002")) | ||
| } | ||
| } |
Binary file renamed
BIN
+216 KB
...distro-job-scheduler-1.1.0.1-SNAPSHOT.zip → ...uler/opendistro-job-scheduler-1.1.0.1.zip
Binary file not shown.