Replace InMemoryPersistedState with GatewayMetaState in CoordinatorTests #36897
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,6 +46,7 @@ | |
| import java.util.stream.Stream; | ||
|
|
||
| import static org.elasticsearch.cluster.metadata.MetaData.CLUSTER_READ_ONLY_BLOCK; | ||
| import static org.elasticsearch.gateway.ClusterStateUpdaters.addStateNotRecoveredBlock; | ||
| import static org.elasticsearch.gateway.ClusterStateUpdaters.closeBadIndices; | ||
| import static org.elasticsearch.gateway.ClusterStateUpdaters.hideStateIfNotRecovered; | ||
| import static org.elasticsearch.gateway.ClusterStateUpdaters.mixCurrentStateAndRecoveredState; | ||
|
|
@@ -182,6 +183,24 @@ public void testRemoveStateNotRecoveredBlock() { | |
| assertFalse(newState.blocks().hasGlobalBlock(STATE_NOT_RECOVERED_BLOCK)); | ||
| } | ||
|
|
||
| public void testAddStateNotRecoveredBlock() { | ||
| final MetaData.Builder metaDataBuilder = MetaData.builder() | ||
| .persistentSettings(Settings.builder().put("test", "test").build()); | ||
| final IndexMetaData indexMetaData = createIndexMetaData("test", Settings.EMPTY); | ||
| metaDataBuilder.put(indexMetaData, false); | ||
|
|
||
| final ClusterState initialState = ClusterState | ||
| .builder(ClusterState.EMPTY_STATE) | ||
| .metaData(metaDataBuilder) | ||
| .build(); | ||
| assertFalse(initialState.blocks().hasGlobalBlock(STATE_NOT_RECOVERED_BLOCK)); | ||
|
|
||
| final ClusterState newState = addStateNotRecoveredBlock(initialState); | ||
|
|
||
| assertMetaDataEquals(initialState, newState); | ||
| assertTrue(newState.blocks().hasGlobalBlock(STATE_NOT_RECOVERED_BLOCK)); | ||
| } | ||
|
|
||
| public void testCloseBadIndices() throws IOException { | ||
| final IndicesService indicesService = mock(IndicesService.class); | ||
| final IndexMetaData good = createIndexMetaData("good", Settings.EMPTY); | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -27,49 +27,20 @@ | |
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.cluster.metadata.Manifest; | ||
| import org.elasticsearch.cluster.metadata.MetaData; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.cluster.node.DiscoveryNodes; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.set.Sets; | ||
| import org.elasticsearch.env.NodeEnvironment; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.not; | ||
|
|
||
| public class GatewayMetaStatePersistedStateTests extends ESTestCase { | ||
| private NodeEnvironment nodeEnvironment; | ||
| private ClusterName clusterName; | ||
| private Settings settings; | ||
|
|
@@ -91,21 +62,21 @@ public void tearDown() throws Exception { | |
| super.tearDown(); | ||
| } | ||
|
|
||
| private MockGatewayMetaState newGateway() throws IOException { | ||
| MockGatewayMetaState gateway = new MockGatewayMetaState(settings, nodeEnvironment, xContentRegistry(), localNode); | ||
| gateway.applyClusterStateUpdaters(); | ||
| return gateway; | ||
| } | ||
|
|
||
| private MockGatewayMetaState maybeNew(MockGatewayMetaState gateway) throws IOException { | ||
| if (randomBoolean()) { | ||
| return newGateway(); | ||
| } | ||
| return gateway; | ||
| } | ||
|
|
||
| public void testInitialState() throws IOException { | ||
| MockGatewayMetaState gateway = newGateway(); | ||
| ClusterState state = gateway.getLastAcceptedState(); | ||
| assertThat(state.getClusterName(), equalTo(clusterName)); | ||
| assertTrue(MetaData.isGlobalStateEquals(state.metaData(), MetaData.EMPTY_META_DATA)); | ||
|
|
@@ -117,7 +88,7 @@ public void testInitialState() throws IOException { | |
| } | ||
|
|
||
| public void testSetCurrentTerm() throws IOException { | ||
| MockGatewayMetaState gateway = newGateway(); | ||
|
|
||
| for (int i = 0; i < randomIntBetween(1, 5); i++) { | ||
| final long currentTerm = randomNonNegativeLong(); | ||
|
|
@@ -171,7 +142,7 @@ private void assertClusterStateEqual(ClusterState expected, ClusterState actual) | |
| } | ||
|
|
||
| public void testSetLastAcceptedState() throws IOException { | ||
| MockGatewayMetaState gateway = newGateway(); | ||
| final long term = randomNonNegativeLong(); | ||
|
|
||
| for (int i = 0; i < randomIntBetween(1, 5); i++) { | ||
|
|
@@ -194,7 +165,7 @@ public void testSetLastAcceptedState() throws IOException { | |
| } | ||
|
|
||
| public void testSetLastAcceptedStateTermChanged() throws IOException { | ||
| MockGatewayMetaState gateway = newGateway(); | ||
|
|
||
| final String indexName = randomAlphaOfLength(10); | ||
| final int numberOfShards = randomIntBetween(1, 5); | ||
|
|
@@ -218,7 +189,7 @@ public void testSetLastAcceptedStateTermChanged() throws IOException { | |
| } | ||
|
|
||
| public void testCurrentTermAndTermAreDifferent() throws IOException { | ||
| MockGatewayMetaState gateway = newGateway(); | ||
|
|
||
| long currentTerm = randomNonNegativeLong(); | ||
| long term = randomValueOtherThan(currentTerm, () -> randomNonNegativeLong()); | ||
|
|
@@ -233,7 +204,7 @@ public void testCurrentTermAndTermAreDifferent() throws IOException { | |
| } | ||
|
|
||
| public void testMarkAcceptedConfigAsCommitted() throws IOException { | ||
| MockGatewayMetaState gateway = newGateway(); | ||
|
|
||
| //generate random coordinationMetaData with different lastAcceptedConfiguration and lastCommittedConfiguration | ||
| CoordinationMetaData coordinationMetaData; | ||
|
|
||
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,66 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License 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 org.elasticsearch.gateway; | ||
|
|
||
| import org.elasticsearch.cluster.metadata.MetaDataIndexUpgradeService; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.cluster.service.ClusterService; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.NamedXContentRegistry; | ||
| import org.elasticsearch.env.NodeEnvironment; | ||
| import org.elasticsearch.indices.IndicesService; | ||
| import org.elasticsearch.plugins.MetaDataUpgrader; | ||
| import org.elasticsearch.transport.TransportService; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| /** | ||
| * {@link GatewayMetaState} constructor accepts a lot of arguments. | ||
| * It's not always easy / convenient to construct these dependencies. | ||
| * This class constructor takes far fewer dependencies and constructs usable {@link GatewayMetaState} with 2 restrictions: | ||
| * no metadata upgrade will be performed and no cluster state updaters will be run. This is sufficient for most of the tests. | ||
| * Metadata upgrade is tested in {@link GatewayMetaStateTests} and different {@link ClusterStateUpdaters} in | ||
| * {@link ClusterStateUpdatersTests}. | ||
| */ | ||
| public class MockGatewayMetaState extends GatewayMetaState { | ||
| private final DiscoveryNode localNode; | ||
|
|
||
| public MockGatewayMetaState(Settings settings, NodeEnvironment nodeEnvironment, | ||
| NamedXContentRegistry xContentRegistry, DiscoveryNode localNode) throws IOException { | ||
| super(settings, nodeEnvironment, new MetaStateService(nodeEnvironment, xContentRegistry), | ||
| mock(MetaDataIndexUpgradeService.class), mock(MetaDataUpgrader.class), | ||
| mock(TransportService.class), mock(ClusterService.class), | ||
| mock(IndicesService.class)); | ||
| this.localNode = localNode; | ||
| } | ||
|
|
||
| @Override | ||
| protected void upgradeMetaData(MetaDataIndexUpgradeService metaDataIndexUpgradeService, MetaDataUpgrader metaDataUpgrader) { | ||
| // MetaData upgrade is tested in GatewayMetaStateTests, we override this method to NOP to make mocking easier | ||
| } | ||
|
|
||
| @Override | ||
| public void applyClusterStateUpdaters() { | ||
| // Just set localNode here, not to mess with ClusterService and IndicesService mocking | ||
| previousClusterState = ClusterStateUpdaters.setLocalNode(previousClusterState, localNode); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: too much indent here?