Skip to content

Commit

Permalink
Apply review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@przemekwitek
przemekwitek committed Feb 19, 2020
1 parent dccd7af commit 0c7ffb8
Showing 1 changed file with 24 additions and 25 deletions.
49 changes: 24 additions & 25 deletions ...test/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndexTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,15 @@
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;

public class AnomalyDetectorsIndexTests extends ESTestCase {

private static final String ML_STATE = ".ml-state";
private static final String ML_STATE_WRITE_ALIAS = ".ml-state-write";

private ThreadPool threadPool;
private IndicesAdminClient indicesAdminClient;
private AdminClient adminClient;
Expand All @@ -69,9 +73,9 @@ public void setUpMocks() {
when(threadPool.getThreadContext()).thenReturn(new ThreadContext(Settings.EMPTY));

indicesAdminClient = mock(IndicesAdminClient.class);
when(indicesAdminClient.prepareCreate(".ml-state"))
.thenReturn(new CreateIndexRequestBuilder(client, CreateIndexAction.INSTANCE, ".ml-state"));
doAnswer(withResponse(new CreateIndexResponse(true, true, ".ml-state"))).when(indicesAdminClient).create(any(), any());
when(indicesAdminClient.prepareCreate(ML_STATE))
.thenReturn(new CreateIndexRequestBuilder(client, CreateIndexAction.INSTANCE, ML_STATE));
doAnswer(withResponse(new CreateIndexResponse(true, true, ML_STATE))).when(indicesAdminClient).create(any(), any());
when(indicesAdminClient.prepareAliases()).thenReturn(new IndicesAliasesRequestBuilder(client, IndicesAliasesAction.INSTANCE));
doAnswer(withResponse(new AcknowledgedResponse(true))).when(indicesAdminClient).aliases(any(), any());

Expand All @@ -98,37 +102,35 @@ public void testCreateStateIndexAndAliasIfNecessary_CleanState() {
AnomalyDetectorsIndex.createStateIndexAndAliasIfNecessary(client, clusterState, finalListener);

InOrder inOrder = inOrder(indicesAdminClient, finalListener);
inOrder.verify(indicesAdminClient).prepareCreate(".ml-state");
inOrder.verify(indicesAdminClient).prepareCreate(ML_STATE);
inOrder.verify(indicesAdminClient).create(createRequestCaptor.capture(), any());
inOrder.verify(finalListener).onResponse(true);

CreateIndexRequest createRequest = createRequestCaptor.getValue();
assertThat(createRequest.index(), equalTo(".ml-state"));
assertThat(createRequest.aliases(), equalTo(Collections.singleton(new Alias(".ml-state-write"))));
assertThat(createRequest.index(), equalTo(ML_STATE));
assertThat(createRequest.aliases(), equalTo(Collections.singleton(new Alias(ML_STATE_WRITE_ALIAS))));
}

private void testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExists(String indexName) {
private void assertNoClientInteractionsWhenWriteAliasAlreadyExists(String indexName) {
ClusterState clusterState = createClusterState(Collections.singletonMap(indexName, createIndexMetaDataWithAlias(indexName)));
AnomalyDetectorsIndex.createStateIndexAndAliasIfNecessary(client, clusterState, finalListener);

InOrder inOrder = inOrder(finalListener);
inOrder.verify(finalListener).onResponse(false);
verify(finalListener).onResponse(false);
}

public void testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExistsAndPointsAtInitialStateIndex() {
testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExists(".ml-state-000001");
assertNoClientInteractionsWhenWriteAliasAlreadyExists(".ml-state-000001");
}

public void testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExistsAndPointsAtSubsequentStateIndex() {
testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExists(".ml-state-000007");
assertNoClientInteractionsWhenWriteAliasAlreadyExists(".ml-state-000007");
}

public void testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExistsAndPointsAtDummyIndex() {
testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExists("dummy-index");
assertNoClientInteractionsWhenWriteAliasAlreadyExists("dummy-index");
}

private void testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExist(List<String> existingIndexNames,
String expectedWriteIndexName) {
private void assertMlStateWriteAliasAddedToMostRecentMlStateIndex(List<String> existingIndexNames, String expectedWriteIndexName) {
ClusterState clusterState =
createClusterState(
existingIndexNames.stream().collect(toMap(Function.identity(), AnomalyDetectorsIndexTests::createIndexMetaData)));
Expand All @@ -142,25 +144,22 @@ private void testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExist(List
IndicesAliasesRequest indicesAliasesRequest = aliasesRequestCaptor.getValue();
assertThat(
indicesAliasesRequest.getAliasActions(),
contains(AliasActions.add().alias(".ml-state-write").index(expectedWriteIndexName)));
contains(AliasActions.add().alias(ML_STATE_WRITE_ALIAS).index(expectedWriteIndexName)));
}

public void testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExistButInitialStateIndexExists() {
testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExist(
Arrays.asList(".ml-state-000001"),
".ml-state-000001");
assertMlStateWriteAliasAddedToMostRecentMlStateIndex(
Arrays.asList(".ml-state-000001"), ".ml-state-000001");
}

public void testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExistButSubsequentStateIndicesExist() {
testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExist(
Arrays.asList(".ml-state-000003", ".ml-state-000040", ".ml-state-000500"),
".ml-state-000500");
assertMlStateWriteAliasAddedToMostRecentMlStateIndex(
Arrays.asList(".ml-state-000003", ".ml-state-000040", ".ml-state-000500"), ".ml-state-000500");
}

public void testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExistButBothLegacyAndNewStateIndicesDoExist() {
testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExist(
Arrays.asList(".ml-state", ".ml-state-000003", ".ml-state-000040", ".ml-state-000500"),
".ml-state-000500");
assertMlStateWriteAliasAddedToMostRecentMlStateIndex(
Arrays.asList(ML_STATE, ".ml-state-000003", ".ml-state-000040", ".ml-state-000500"), ".ml-state-000500");
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -197,7 +196,7 @@ private static IndexMetaData createIndexMetaData(String indexName, boolean withA
IndexMetaData.Builder builder = IndexMetaData.builder(indexName)
.settings(settings);
if (withAlias) {
builder.putAlias(AliasMetaData.builder(".ml-state-write").build());
builder.putAlias(AliasMetaData.builder(ML_STATE_WRITE_ALIAS).build());
}
return builder.build();
}
Expand Down

0 comments on commit 0c7ffb8

Please sign in to comment.