forked from opensearch-project/OpenSearch
-
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.
Added support for feature flags in opensearch.yml (opensearch-project…
…#4959) This change introduces a static store "settings" in FeatureFlags.java file to enable isEnabled method to fetch flag settings defined in opensearch.yml. Signed-off-by: Nagaraj Tantri <[email protected]> (cherry picked from commit 241bd42)
- Loading branch information
Showing
9 changed files
with
612 additions
and
34 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
223 changes: 194 additions & 29 deletions
223
...src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationIT.java
Large diffs are not rendered by default.
Oops, something went wrong.
278 changes: 278 additions & 0 deletions
278
...r/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.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,278 @@ | ||
| /* | ||
| * 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.snapshots; | ||
|
|
||
| import com.carrotsearch.randomizedtesting.RandomizedTest; | ||
| import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; | ||
| import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequestBuilder; | ||
| import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; | ||
| import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; | ||
| import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest; | ||
| import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse; | ||
| import org.opensearch.action.search.SearchResponse; | ||
| import org.opensearch.cluster.metadata.IndexMetadata; | ||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.common.util.FeatureFlags; | ||
| import org.opensearch.index.query.QueryBuilders; | ||
| import org.opensearch.indices.replication.common.ReplicationType; | ||
| import org.opensearch.rest.RestStatus; | ||
| import org.opensearch.test.BackgroundIndexer; | ||
| import org.opensearch.test.InternalTestCluster; | ||
| import org.opensearch.test.OpenSearchIntegTestCase; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; | ||
| import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; | ||
|
|
||
| @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0) | ||
| public class SegmentReplicationSnapshotIT extends AbstractSnapshotIntegTestCase { | ||
| private static final String INDEX_NAME = "test-segrep-idx"; | ||
| private static final String RESTORED_INDEX_NAME = INDEX_NAME + "-restored"; | ||
| private static final int SHARD_COUNT = 1; | ||
| private static final int REPLICA_COUNT = 1; | ||
| private static final int DOC_COUNT = 1010; | ||
|
|
||
| private static final String REPOSITORY_NAME = "test-segrep-repo"; | ||
| private static final String SNAPSHOT_NAME = "test-segrep-snapshot"; | ||
|
|
||
| @Override | ||
| protected Settings featureFlagSettings() { | ||
| return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.REPLICATION_TYPE, "true").build(); | ||
| } | ||
|
|
||
| public Settings segRepEnableIndexSettings() { | ||
| return getShardSettings().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT).build(); | ||
| } | ||
|
|
||
| public Settings docRepEnableIndexSettings() { | ||
| return getShardSettings().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT).build(); | ||
| } | ||
|
|
||
| public Settings.Builder getShardSettings() { | ||
| return Settings.builder() | ||
| .put(super.indexSettings()) | ||
| .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, SHARD_COUNT) | ||
| .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, REPLICA_COUNT); | ||
| } | ||
|
|
||
| public Settings restoreIndexSegRepSettings() { | ||
| return Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT).build(); | ||
| } | ||
|
|
||
| public Settings restoreIndexDocRepSettings() { | ||
| return Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT).build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean addMockInternalEngine() { | ||
| return false; | ||
| } | ||
|
|
||
| public void ingestData(int docCount, String indexName) throws Exception { | ||
| try ( | ||
| BackgroundIndexer indexer = new BackgroundIndexer( | ||
| indexName, | ||
| "_doc", | ||
| client(), | ||
| -1, | ||
| RandomizedTest.scaledRandomIntBetween(2, 5), | ||
| false, | ||
| random() | ||
| ) | ||
| ) { | ||
| indexer.start(docCount); | ||
| waitForDocs(docCount, indexer); | ||
| refresh(indexName); | ||
| } | ||
| } | ||
|
|
||
| // Start cluster with provided settings and return the node names as list | ||
| public List<String> startClusterWithSettings(Settings indexSettings, int replicaCount) throws Exception { | ||
| // Start primary | ||
| final String primaryNode = internalCluster().startNode(featureFlagSettings()); | ||
| List<String> nodeNames = new ArrayList<>(); | ||
| nodeNames.add(primaryNode); | ||
| for (int i = 0; i < replicaCount; i++) { | ||
| nodeNames.add(internalCluster().startNode(featureFlagSettings())); | ||
| } | ||
| createIndex(INDEX_NAME, indexSettings); | ||
| ensureGreen(INDEX_NAME); | ||
| // Ingest data | ||
| ingestData(DOC_COUNT, INDEX_NAME); | ||
| return nodeNames; | ||
| } | ||
|
|
||
| public void createSnapshot() { | ||
| // Snapshot declaration | ||
| Path absolutePath = randomRepoPath().toAbsolutePath(); | ||
| // Create snapshot | ||
| createRepository(REPOSITORY_NAME, "fs", absolutePath); | ||
| CreateSnapshotResponse createSnapshotResponse = client().admin() | ||
| .cluster() | ||
| .prepareCreateSnapshot(REPOSITORY_NAME, SNAPSHOT_NAME) | ||
| .setWaitForCompletion(true) | ||
| .setIndices(INDEX_NAME) | ||
| .get(); | ||
| assertThat( | ||
| createSnapshotResponse.getSnapshotInfo().successfulShards(), | ||
| equalTo(createSnapshotResponse.getSnapshotInfo().totalShards()) | ||
| ); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().state(), equalTo(SnapshotState.SUCCESS)); | ||
| } | ||
|
|
||
| public RestoreSnapshotResponse restoreSnapshotWithSettings(Settings indexSettings) { | ||
| RestoreSnapshotRequestBuilder builder = client().admin() | ||
| .cluster() | ||
| .prepareRestoreSnapshot(REPOSITORY_NAME, SNAPSHOT_NAME) | ||
| .setWaitForCompletion(false) | ||
| .setRenamePattern(INDEX_NAME) | ||
| .setRenameReplacement(RESTORED_INDEX_NAME); | ||
| if (indexSettings != null) { | ||
| builder.setIndexSettings(indexSettings); | ||
| } | ||
| return builder.get(); | ||
| } | ||
|
|
||
| public void testRestoreOnSegRep() throws Exception { | ||
| // Start cluster with one primary and one replica node | ||
| startClusterWithSettings(segRepEnableIndexSettings(), 1); | ||
| createSnapshot(); | ||
| // Delete index | ||
| assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get()); | ||
| assertFalse("index [" + INDEX_NAME + "] should have been deleted", indexExists(INDEX_NAME)); | ||
|
|
||
| RestoreSnapshotResponse restoreSnapshotResponse = restoreSnapshotWithSettings(null); | ||
|
|
||
| // Assertions | ||
| assertThat(restoreSnapshotResponse.status(), equalTo(RestStatus.ACCEPTED)); | ||
| ensureGreen(RESTORED_INDEX_NAME); | ||
| GetSettingsResponse settingsResponse = client().admin() | ||
| .indices() | ||
| .getSettings(new GetSettingsRequest().indices(RESTORED_INDEX_NAME)) | ||
| .get(); | ||
| assertEquals(settingsResponse.getSetting(RESTORED_INDEX_NAME, "index.replication.type"), "SEGMENT"); | ||
| SearchResponse resp = client().prepareSearch(RESTORED_INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).get(); | ||
| assertHitCount(resp, DOC_COUNT); | ||
| } | ||
|
|
||
| public void testSnapshotOnSegRep_RestoreOnSegRepDuringIngestion() throws Exception { | ||
| startClusterWithSettings(segRepEnableIndexSettings(), 1); | ||
| createSnapshot(); | ||
| // Delete index | ||
| assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get()); | ||
| assertFalse("index [" + INDEX_NAME + "] should have been deleted", indexExists(INDEX_NAME)); | ||
|
|
||
| RestoreSnapshotResponse restoreSnapshotResponse = restoreSnapshotWithSettings(null); | ||
|
|
||
| // Assertions | ||
| assertThat(restoreSnapshotResponse.status(), equalTo(RestStatus.ACCEPTED)); | ||
| ingestData(5000, RESTORED_INDEX_NAME); | ||
| ensureGreen(RESTORED_INDEX_NAME); | ||
| GetSettingsResponse settingsResponse = client().admin() | ||
| .indices() | ||
| .getSettings(new GetSettingsRequest().indices(RESTORED_INDEX_NAME)) | ||
| .get(); | ||
| assertEquals(settingsResponse.getSetting(RESTORED_INDEX_NAME, "index.replication.type"), "SEGMENT"); | ||
| SearchResponse resp = client().prepareSearch(RESTORED_INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).get(); | ||
| assertHitCount(resp, DOC_COUNT + 5000); | ||
| } | ||
|
|
||
| public void testSnapshotOnDocRep_RestoreOnSegRep() throws Exception { | ||
| startClusterWithSettings(docRepEnableIndexSettings(), 1); | ||
| createSnapshot(); | ||
| // Delete index | ||
| assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get()); | ||
|
|
||
| RestoreSnapshotResponse restoreSnapshotResponse = restoreSnapshotWithSettings(restoreIndexSegRepSettings()); | ||
|
|
||
| // Assertions | ||
| assertThat(restoreSnapshotResponse.status(), equalTo(RestStatus.ACCEPTED)); | ||
| ensureGreen(RESTORED_INDEX_NAME); | ||
| GetSettingsResponse settingsResponse = client().admin() | ||
| .indices() | ||
| .getSettings(new GetSettingsRequest().indices(RESTORED_INDEX_NAME)) | ||
| .get(); | ||
| assertEquals(settingsResponse.getSetting(RESTORED_INDEX_NAME, "index.replication.type"), "SEGMENT"); | ||
|
|
||
| SearchResponse resp = client().prepareSearch(RESTORED_INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).get(); | ||
| assertHitCount(resp, DOC_COUNT); | ||
| } | ||
|
|
||
| public void testSnapshotOnSegRep_RestoreOnDocRep() throws Exception { | ||
| // Start a cluster with one primary and one replica | ||
| startClusterWithSettings(segRepEnableIndexSettings(), 1); | ||
| createSnapshot(); | ||
| // Delete index | ||
| assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get()); | ||
|
|
||
| RestoreSnapshotResponse restoreSnapshotResponse = restoreSnapshotWithSettings(restoreIndexDocRepSettings()); | ||
|
|
||
| // Assertions | ||
| assertThat(restoreSnapshotResponse.status(), equalTo(RestStatus.ACCEPTED)); | ||
| ensureGreen(RESTORED_INDEX_NAME); | ||
| GetSettingsResponse settingsResponse = client().admin() | ||
| .indices() | ||
| .getSettings(new GetSettingsRequest().indices(RESTORED_INDEX_NAME)) | ||
| .get(); | ||
| assertEquals(settingsResponse.getSetting(RESTORED_INDEX_NAME, "index.replication.type"), "DOCUMENT"); | ||
| SearchResponse resp = client().prepareSearch(RESTORED_INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).get(); | ||
| assertHitCount(resp, DOC_COUNT); | ||
| } | ||
|
|
||
| public void testSnapshotOnDocRep_RestoreOnDocRep() throws Exception { | ||
| startClusterWithSettings(docRepEnableIndexSettings(), 1); | ||
| createSnapshot(); | ||
| // Delete index | ||
| assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get()); | ||
|
|
||
| RestoreSnapshotResponse restoreSnapshotResponse = restoreSnapshotWithSettings(restoreIndexDocRepSettings()); | ||
|
|
||
| // Assertions | ||
| assertThat(restoreSnapshotResponse.status(), equalTo(RestStatus.ACCEPTED)); | ||
| ensureGreen(RESTORED_INDEX_NAME); | ||
| GetSettingsResponse settingsResponse = client().admin() | ||
| .indices() | ||
| .getSettings(new GetSettingsRequest().indices(RESTORED_INDEX_NAME)) | ||
| .get(); | ||
| assertEquals(settingsResponse.getSetting(RESTORED_INDEX_NAME, "index.replication.type"), "DOCUMENT"); | ||
|
|
||
| SearchResponse resp = client().prepareSearch(RESTORED_INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).get(); | ||
| assertHitCount(resp, DOC_COUNT); | ||
| } | ||
|
|
||
| public void testRestoreOnReplicaNode() throws Exception { | ||
| List<String> nodeNames = startClusterWithSettings(segRepEnableIndexSettings(), 1); | ||
| final String primaryNode = nodeNames.get(0); | ||
| createSnapshot(); | ||
| // Delete index | ||
| assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get()); | ||
| assertFalse("index [" + INDEX_NAME + "] should have been deleted", indexExists(INDEX_NAME)); | ||
|
|
||
| // stop the primary node so that restoration happens on replica node | ||
| internalCluster().stopRandomNode(InternalTestCluster.nameFilter(primaryNode)); | ||
|
|
||
| RestoreSnapshotResponse restoreSnapshotResponse = restoreSnapshotWithSettings(null); | ||
|
|
||
| // Assertions | ||
| assertThat(restoreSnapshotResponse.status(), equalTo(RestStatus.ACCEPTED)); | ||
| internalCluster().startNode(featureFlagSettings()); | ||
| ensureGreen(RESTORED_INDEX_NAME); | ||
| GetSettingsResponse settingsResponse = client().admin() | ||
| .indices() | ||
| .getSettings(new GetSettingsRequest().indices(RESTORED_INDEX_NAME)) | ||
| .get(); | ||
| assertEquals(settingsResponse.getSetting(RESTORED_INDEX_NAME, "index.replication.type"), "SEGMENT"); | ||
| SearchResponse resp = client().prepareSearch(RESTORED_INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).get(); | ||
| assertHitCount(resp, DOC_COUNT); | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
server/src/main/java/org/opensearch/common/settings/FeatureFlagSettings.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,44 @@ | ||
| /* | ||
| * 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.common.settings; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import org.opensearch.common.settings.Setting.Property; | ||
| import org.opensearch.common.util.FeatureFlags; | ||
|
|
||
| /** | ||
| * Encapsulates all valid feature flag level settings. | ||
| * | ||
| * @opensearch.internal | ||
| */ | ||
| public class FeatureFlagSettings extends AbstractScopedSettings { | ||
|
|
||
| protected FeatureFlagSettings( | ||
| Settings settings, | ||
| Set<Setting<?>> settingsSet, | ||
| Set<SettingUpgrader<?>> settingUpgraders, | ||
| Property scope | ||
| ) { | ||
| super(settings, settingsSet, settingUpgraders, scope); | ||
| } | ||
|
|
||
| public static final Set<Setting<?>> BUILT_IN_FEATURE_FLAGS = Collections.unmodifiableSet( | ||
| new HashSet<>( | ||
| Arrays.asList( | ||
| FeatureFlags.REPLICATION_TYPE_SETTING, | ||
| FeatureFlags.REMOTE_STORE_SETTING, | ||
| FeatureFlags.SEARCHABLE_SNAPSHOT_SETTING, | ||
| FeatureFlags.EXTENSIONS_SETTING | ||
| ) | ||
| ) | ||
| ); | ||
| } |
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.