forked from opendistro-for-elasticsearch/index-management
-
Notifications
You must be signed in to change notification settings - Fork 0
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 (opendistro-for-elasticsearch#190)
* Adds logs, fix for index creation date -1L, nullable checks (opendistro-for-elasticsearch#170) * Index creation_date of -1L should evaluate to false, adds extra logs * Adds kotlin compiler check and fixes nullable values * Adds log * Delete and close failing during snapshot in progress (opendistro-for-elasticsearch#172) * Fixes AttemptDeleteStep failing from a SnapshotInProgressException * Fixes close action failing on snapshot in progress exception, fixes imports * Fixes styling * Fixes CloseIndexResponse init * Fixes missed merge conflict * Fixes tests
- Loading branch information
Showing
10 changed files
with
364 additions
and
27 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
110 changes: 110 additions & 0 deletions
110
.../com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptCloseStepTests.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,110 @@ | ||
| /* | ||
| * 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.step | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.CloseActionConfig | ||
| import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.close.AttemptCloseStep | ||
| import com.nhaarman.mockitokotlin2.any | ||
| import com.nhaarman.mockitokotlin2.doAnswer | ||
| import com.nhaarman.mockitokotlin2.doReturn | ||
| import com.nhaarman.mockitokotlin2.mock | ||
| import com.nhaarman.mockitokotlin2.whenever | ||
| import kotlinx.coroutines.runBlocking | ||
| import org.elasticsearch.action.ActionListener | ||
| import org.elasticsearch.action.support.master.AcknowledgedResponse | ||
| import org.elasticsearch.client.AdminClient | ||
| import org.elasticsearch.client.Client | ||
| import org.elasticsearch.client.IndicesAdminClient | ||
| import org.elasticsearch.cluster.service.ClusterService | ||
| import org.elasticsearch.snapshots.SnapshotInProgressException | ||
| import org.elasticsearch.test.ESTestCase | ||
| import kotlin.IllegalArgumentException | ||
|
|
||
| class AttemptCloseStepTests : ESTestCase() { | ||
|
|
||
| private val clusterService: ClusterService = mock() | ||
|
|
||
| fun `test close step sets step status to completed when successful`() { | ||
| val closeIndexResponse = AcknowledgedResponse(true) | ||
| val client = getClient(getAdminClient(getIndicesAdminClient(closeIndexResponse, null))) | ||
|
|
||
| runBlocking { | ||
| val closeActionConfig = CloseActionConfig(0) | ||
| val managedIndexMetaData = ManagedIndexMetaData("test", "indexUuid", "policy_id", null, null, null, null, null, null, null, null, null, null) | ||
| val attemptCloseStep = AttemptCloseStep(clusterService, client, closeActionConfig, managedIndexMetaData) | ||
| attemptCloseStep.execute() | ||
| val updatedManagedIndexMetaData = attemptCloseStep.getUpdatedManagedIndexMetaData(managedIndexMetaData) | ||
| assertEquals("Step status is not COMPLETED", Step.StepStatus.COMPLETED, updatedManagedIndexMetaData.stepMetaData?.stepStatus) | ||
| } | ||
| } | ||
|
|
||
| fun `test close step sets step status to failed when not acknowledged`() { | ||
| val closeIndexResponse = AcknowledgedResponse(false) | ||
| val client = getClient(getAdminClient(getIndicesAdminClient(closeIndexResponse, null))) | ||
|
|
||
| runBlocking { | ||
| val closeActionConfig = CloseActionConfig(0) | ||
| val managedIndexMetaData = ManagedIndexMetaData("test", "indexUuid", "policy_id", null, null, null, null, null, null, null, null, null, null) | ||
| val attemptCloseStep = AttemptCloseStep(clusterService, client, closeActionConfig, managedIndexMetaData) | ||
| attemptCloseStep.execute() | ||
| val updatedManagedIndexMetaData = attemptCloseStep.getUpdatedManagedIndexMetaData(managedIndexMetaData) | ||
| assertEquals("Step status is not FAILED", Step.StepStatus.FAILED, updatedManagedIndexMetaData.stepMetaData?.stepStatus) | ||
| } | ||
| } | ||
|
|
||
| fun `test close step sets step status to failed when error thrown`() { | ||
| val exception = IllegalArgumentException("example") | ||
| val client = getClient(getAdminClient(getIndicesAdminClient(null, exception))) | ||
|
|
||
| runBlocking { | ||
| val closeActionConfig = CloseActionConfig(0) | ||
| val managedIndexMetaData = ManagedIndexMetaData("test", "indexUuid", "policy_id", null, null, null, null, null, null, null, null, null, null) | ||
| val attemptCloseStep = AttemptCloseStep(clusterService, client, closeActionConfig, managedIndexMetaData) | ||
| attemptCloseStep.execute() | ||
| val updatedManagedIndexMetaData = attemptCloseStep.getUpdatedManagedIndexMetaData(managedIndexMetaData) | ||
| logger.info(updatedManagedIndexMetaData) | ||
| assertEquals("Step status is not FAILED", Step.StepStatus.FAILED, updatedManagedIndexMetaData.stepMetaData?.stepStatus) | ||
| } | ||
| } | ||
|
|
||
| fun `test close step sets step status to condition not met when snapshot in progress error thrown`() { | ||
| val exception = SnapshotInProgressException("example") | ||
| val client = getClient(getAdminClient(getIndicesAdminClient(null, exception))) | ||
|
|
||
| runBlocking { | ||
| val closeActionConfig = CloseActionConfig(0) | ||
| val managedIndexMetaData = ManagedIndexMetaData("test", "indexUuid", "policy_id", null, null, null, null, null, null, null, null, null, null) | ||
| val attemptCloseStep = AttemptCloseStep(clusterService, client, closeActionConfig, managedIndexMetaData) | ||
| attemptCloseStep.execute() | ||
| val updatedManagedIndexMetaData = attemptCloseStep.getUpdatedManagedIndexMetaData(managedIndexMetaData) | ||
| assertEquals("Step status is not CONDITION_NOT_MET", Step.StepStatus.CONDITION_NOT_MET, updatedManagedIndexMetaData.stepMetaData?.stepStatus) | ||
| } | ||
| } | ||
|
|
||
| private fun getClient(adminClient: AdminClient): Client = mock { on { admin() } doReturn adminClient } | ||
| private fun getAdminClient(indicesAdminClient: IndicesAdminClient): AdminClient = mock { on { indices() } doReturn indicesAdminClient } | ||
| private fun getIndicesAdminClient(closeIndexResponse: AcknowledgedResponse?, exception: Exception?): IndicesAdminClient { | ||
| assertTrue("Must provide one and only one response or exception", (closeIndexResponse != null).xor(exception != null)) | ||
| return mock { | ||
| doAnswer { invocationOnMock -> | ||
| val listener = invocationOnMock.getArgument<ActionListener<AcknowledgedResponse>>(1) | ||
| if (closeIndexResponse != null) listener.onResponse(closeIndexResponse) | ||
| else listener.onFailure(exception) | ||
| }.whenever(this.mock).close(any(), any()) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.