-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial commit for search only replica.
This PR contains the following: 1. Introduce searchOnly flag on ShardRouting. 2. Added feature flag to enable/disable the feature. 3. supports both create and update APIs to toggle search replica count. 4. Changes to exclude search replicas from primary eligibility. 5. Changes to prevent replicationOperations from routing to search replicas. Signed-off-by: Marc Handalian <[email protected]>
- Loading branch information
Showing
23 changed files
with
1,052 additions
and
21 deletions.
There are no files selected for viewing
75 changes: 75 additions & 0 deletions
75
...ernalClusterTest/java/org/opensearch/indices/settings/SearchOnlyReplicaFeatureFlagIT.java
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,75 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
package org.opensearch.indices.settings; | ||
|
||
import org.opensearch.cluster.metadata.IndexMetadata; | ||
import org.opensearch.common.settings.Settings; | ||
import org.opensearch.common.settings.SettingsException; | ||
import org.opensearch.common.util.FeatureFlags; | ||
import org.opensearch.indices.replication.common.ReplicationType; | ||
import org.opensearch.test.OpenSearchIntegTestCase; | ||
|
||
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SEARCH_REPLICAS; | ||
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE; | ||
import static org.opensearch.cluster.routing.UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING; | ||
|
||
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 1) | ||
public class SearchOnlyReplicaFeatureFlagIT extends OpenSearchIntegTestCase { | ||
|
||
private static final String TEST_INDEX = "test_index"; | ||
|
||
@Override | ||
protected Settings featureFlagSettings() { | ||
return Settings.builder() | ||
.put(super.featureFlagSettings()) | ||
.put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.FALSE) | ||
.build(); | ||
} | ||
|
||
@Override | ||
public Settings indexSettings() { | ||
return Settings.builder() | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SEARCH_REPLICAS, 1) | ||
.put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT) | ||
.build(); | ||
} | ||
|
||
public void testCreateFeatureFlagDisabled() { | ||
Settings settings = Settings.builder().put(indexSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, false).build(); | ||
|
||
SettingsException settingsException = expectThrows(SettingsException.class, () -> createIndex(TEST_INDEX, settings)); | ||
assertEquals( | ||
"unknown setting [index.number_of_search_only_shards] did you mean [index.number_of_routing_shards]?", | ||
settingsException.getMessage() | ||
); | ||
} | ||
|
||
public void testUpdateFeatureFlagDisabled() { | ||
Settings settings = Settings.builder() | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) | ||
.put(INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "0ms") // so that after we punt a node we can immediately try to | ||
// reallocate after node left. | ||
.put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT) | ||
.build(); | ||
|
||
createIndex(TEST_INDEX, settings); | ||
SettingsException settingsException = expectThrows(SettingsException.class, () -> { | ||
client().admin() | ||
.indices() | ||
.prepareUpdateSettings(TEST_INDEX) | ||
.setSettings(Settings.builder().put(SETTING_NUMBER_OF_SEARCH_REPLICAS, 1)) | ||
.get(); | ||
}); | ||
assertEquals( | ||
"unknown setting [index.number_of_search_only_shards] did you mean [index.number_of_routing_shards]?", | ||
settingsException.getMessage() | ||
); | ||
} | ||
} |
186 changes: 186 additions & 0 deletions
186
server/src/internalClusterTest/java/org/opensearch/indices/settings/SearchOnlyReplicaIT.java
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,186 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
package org.opensearch.indices.settings; | ||
|
||
import org.opensearch.cluster.ClusterState; | ||
import org.opensearch.cluster.metadata.IndexMetadata; | ||
import org.opensearch.cluster.metadata.Metadata; | ||
import org.opensearch.cluster.routing.IndexShardRoutingTable; | ||
import org.opensearch.cluster.routing.ShardRouting; | ||
import org.opensearch.common.settings.Settings; | ||
import org.opensearch.common.util.FeatureFlags; | ||
import org.opensearch.indices.replication.common.ReplicationType; | ||
import org.opensearch.test.InternalTestCluster; | ||
import org.opensearch.test.OpenSearchIntegTestCase; | ||
|
||
import java.io.IOException; | ||
|
||
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SEARCH_REPLICAS; | ||
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE; | ||
import static org.opensearch.cluster.routing.UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING; | ||
|
||
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0) | ||
public class SearchOnlyReplicaIT extends OpenSearchIntegTestCase { | ||
|
||
private static final String TEST_INDEX = "test_index"; | ||
|
||
@Override | ||
protected Settings featureFlagSettings() { | ||
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build(); | ||
} | ||
|
||
private final String expectedFailureMessage = | ||
"To set index.number_of_search_only_shards, index.replication.type must be set to SEGMENT"; | ||
|
||
@Override | ||
public Settings indexSettings() { | ||
return Settings.builder() | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) | ||
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SEARCH_REPLICAS, 1) | ||
.put(INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "0ms") // so that after we punt a node we can immediately try to | ||
// reallocate after node left. | ||
.put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT) | ||
.build(); | ||
} | ||
|
||
public void testCreateDocRepFails() { | ||
Settings settings = Settings.builder().put(indexSettings()).put(SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT).build(); | ||
|
||
IllegalArgumentException illegalArgumentException = expectThrows( | ||
IllegalArgumentException.class, | ||
() -> createIndex(TEST_INDEX, settings) | ||
); | ||
assertEquals(expectedFailureMessage, illegalArgumentException.getMessage()); | ||
} | ||
|
||
public void testUpdateDocRepFails() { | ||
Settings settings = Settings.builder() | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) | ||
.put(SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT) | ||
.build(); | ||
// create succeeds | ||
createIndex(TEST_INDEX, settings); | ||
|
||
// update fails | ||
IllegalArgumentException illegalArgumentException = expectThrows(IllegalArgumentException.class, () -> { | ||
client().admin() | ||
.indices() | ||
.prepareUpdateSettings(TEST_INDEX) | ||
.setSettings(Settings.builder().put(SETTING_NUMBER_OF_SEARCH_REPLICAS, 1)) | ||
.get(); | ||
}); | ||
assertEquals(expectedFailureMessage, illegalArgumentException.getMessage()); | ||
} | ||
|
||
public void testSearchReplicasAreNotPrimaryEligible() throws IOException { | ||
int numSearchReplicas = randomIntBetween(0, 3); | ||
int numWriterReplicas = randomIntBetween(0, 3); | ||
internalCluster().startClusterManagerOnlyNode(); | ||
String primaryNodeName = internalCluster().startDataOnlyNode(); | ||
createIndex( | ||
TEST_INDEX, | ||
Settings.builder() | ||
.put(indexSettings()) | ||
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numWriterReplicas) | ||
.put(IndexMetadata.SETTING_NUMBER_OF_SEARCH_REPLICAS, numSearchReplicas) | ||
.build() | ||
); | ||
ensureYellow(TEST_INDEX); | ||
for (int i = 0; i < numSearchReplicas + numWriterReplicas; i++) { | ||
internalCluster().startDataOnlyNode(); | ||
} | ||
ensureGreen(TEST_INDEX); | ||
|
||
// assert shards are on separate nodes & all active | ||
assertActiveShardCounts(numSearchReplicas, numWriterReplicas); | ||
|
||
// stop the primary and ensure search shard is not promoted: | ||
internalCluster().stopRandomNode(InternalTestCluster.nameFilter(primaryNodeName)); | ||
ensureRed(TEST_INDEX); | ||
|
||
if (numWriterReplicas > 0) { | ||
assertActiveShardCounts(numSearchReplicas, numWriterReplicas - 1); // 1 repl is inactive that was promoted to primary | ||
// add back a node | ||
internalCluster().startDataOnlyNode(); | ||
ensureGreen(TEST_INDEX); | ||
} else { | ||
// index falls red and does not recover | ||
// Without any writer replica with n2n replication this is an unrecoverable scenario and snapshot restore is required. | ||
ensureRed(TEST_INDEX); | ||
assertActiveSearchShards(numSearchReplicas); | ||
} | ||
} | ||
|
||
public void testSearchReplicaScaling() { | ||
internalCluster().startNodes(2); | ||
createIndex(TEST_INDEX); | ||
ensureGreen(TEST_INDEX); | ||
// assert settings | ||
Metadata metadata = client().admin().cluster().prepareState().get().getState().metadata(); | ||
int numSearchReplicas = Integer.parseInt(metadata.index(TEST_INDEX).getSettings().get(SETTING_NUMBER_OF_SEARCH_REPLICAS)); | ||
assertEquals(1, numSearchReplicas); | ||
|
||
// assert cluster state & routing table | ||
assertActiveSearchShards(1); | ||
|
||
// Add another node and search replica | ||
internalCluster().startDataOnlyNode(); | ||
client().admin() | ||
.indices() | ||
.prepareUpdateSettings(TEST_INDEX) | ||
.setSettings(Settings.builder().put(SETTING_NUMBER_OF_SEARCH_REPLICAS, 2)) | ||
.get(); | ||
|
||
ensureGreen(TEST_INDEX); | ||
assertActiveSearchShards(2); | ||
|
||
// remove all search shards | ||
client().admin() | ||
.indices() | ||
.prepareUpdateSettings(TEST_INDEX) | ||
.setSettings(Settings.builder().put(SETTING_NUMBER_OF_SEARCH_REPLICAS, 0)) | ||
.get(); | ||
ensureGreen(TEST_INDEX); | ||
assertActiveSearchShards(0); | ||
} | ||
|
||
/** | ||
* Helper to assert counts of active shards for each type. | ||
*/ | ||
private void assertActiveShardCounts(int expectedSearchReplicaCount, int expectedWriteReplicaCount) { | ||
// assert routing table | ||
IndexShardRoutingTable indexShardRoutingTable = getIndexShardRoutingTable(); | ||
// assert search replica count | ||
int activeCount = expectedSearchReplicaCount + expectedWriteReplicaCount; | ||
assertEquals(expectedSearchReplicaCount, indexShardRoutingTable.searchOnlyReplicas().stream().filter(ShardRouting::active).count()); | ||
assertEquals(expectedWriteReplicaCount, indexShardRoutingTable.writerReplicas().stream().filter(ShardRouting::active).count()); | ||
assertEquals( | ||
expectedWriteReplicaCount + expectedSearchReplicaCount, | ||
indexShardRoutingTable.replicaShards().stream().filter(ShardRouting::active).count() | ||
); | ||
|
||
// assert routing nodes | ||
ClusterState clusterState = getClusterState(); | ||
assertEquals(activeCount, clusterState.getRoutingNodes().shards(r -> r.active() && !r.primary()).size()); | ||
assertEquals(expectedSearchReplicaCount, clusterState.getRoutingNodes().shards(r -> r.active() && r.isSearchOnly()).size()); | ||
assertEquals( | ||
expectedWriteReplicaCount, | ||
clusterState.getRoutingNodes().shards(r -> r.active() && !r.primary() && !r.isSearchOnly()).size() | ||
); | ||
} | ||
|
||
private void assertActiveSearchShards(int expectedSearchReplicaCount) { | ||
assertActiveShardCounts(expectedSearchReplicaCount, 0); | ||
} | ||
|
||
private IndexShardRoutingTable getIndexShardRoutingTable() { | ||
return getClusterState().routingTable().index(TEST_INDEX).shards().values().stream().findFirst().get(); | ||
} | ||
} |
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
Oops, something went wrong.