Skip to content

Commit 5799fe7

Browse files
vinaykpudvinaykpud
authored
Remove Reader Writer Split experimental feature flag (#17880)
* Remove Reader Writer Split experimental feature flag Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Fixed failing tests Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Fixed failing unit tests Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Added back setting updater in Search only Operation routing Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Fixed SpotlessApply Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Fixed the way roles added while creating node for testing Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Revert "Fixed failing unit tests" This reverts commit 7aa103a. Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Revert "Fixed the way roles added while creating node for testing" This reverts commit 4481794. Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> * Added SEARCH_ROLE to rolesToMap Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com> --------- Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
1 parent ddb4354 commit 5799fe7

30 files changed

+60
-185
lines changed

‎server/src/internalClusterTest/java/org/opensearch/action/admin/indices/scale/searchonly/ScaleIndexIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.opensearch.cluster.routing.IndexShardRoutingTable;
1919
import org.opensearch.cluster.routing.ShardRouting;
2020
import org.opensearch.common.settings.Settings;
21-
import org.opensearch.common.util.FeatureFlags;
2221
import org.opensearch.core.rest.RestStatus;
2322
import org.opensearch.indices.replication.common.ReplicationType;
2423
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
@@ -41,11 +40,6 @@ public class ScaleIndexIT extends RemoteStoreBaseIntegTestCase {
4140

4241
private static final String TEST_INDEX = "test_scale_index";
4342

44-
@Override
45-
protected Settings featureFlagSettings() {
46-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build();
47-
}
48-
4943
public Settings indexSettings() {
5044
return Settings.builder().put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT).build();
5145
}

‎server/src/internalClusterTest/java/org/opensearch/cluster/allocation/SearchReplicaAllocationIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.opensearch.cluster.routing.IndexShardRoutingTable;
1313
import org.opensearch.cluster.routing.ShardRouting;
1414
import org.opensearch.common.settings.Settings;
15-
import org.opensearch.common.util.FeatureFlags;
1615
import org.opensearch.indices.replication.common.ReplicationType;
1716
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
1817
import org.opensearch.test.OpenSearchIntegTestCase;
@@ -25,11 +24,6 @@
2524
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
2625
public class SearchReplicaAllocationIT extends RemoteStoreBaseIntegTestCase {
2726

28-
@Override
29-
protected Settings featureFlagSettings() {
30-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build();
31-
}
32-
3327
public void testSearchReplicaAllocatedToDedicatedSearchNode() {
3428
internalCluster().startClusterManagerOnlyNode();
3529
String primaryNode = internalCluster().startDataOnlyNode();

‎server/src/internalClusterTest/java/org/opensearch/cluster/allocation/SearchReplicaAwarenessAllocationIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.opensearch.cluster.routing.allocation.AwarenessReplicaBalance;
2020
import org.opensearch.cluster.routing.allocation.decider.AwarenessAllocationDecider;
2121
import org.opensearch.common.settings.Settings;
22-
import org.opensearch.common.util.FeatureFlags;
2322
import org.opensearch.indices.replication.common.ReplicationType;
2423
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
2524
import org.opensearch.test.OpenSearchIntegTestCase;
@@ -40,11 +39,6 @@ public class SearchReplicaAwarenessAllocationIT extends RemoteStoreBaseIntegTest
4039

4140
private final Logger logger = LogManager.getLogger(SearchReplicaAwarenessAllocationIT.class);
4241

43-
@Override
44-
protected Settings featureFlagSettings() {
45-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build();
46-
}
47-
4842
public void testAllocationAwarenessZones() {
4943
Settings commonSettings = Settings.builder()
5044
.put(AwarenessAllocationDecider.CLUSTER_ROUTING_ALLOCATION_AWARENESS_FORCE_GROUP_SETTING.getKey() + "zone.values", "a,b")

‎server/src/internalClusterTest/java/org/opensearch/cluster/metadata/AutoExpandSearchReplicasIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.opensearch.cluster.routing.UnassignedInfo;
1212
import org.opensearch.common.settings.Settings;
1313
import org.opensearch.common.unit.TimeValue;
14-
import org.opensearch.common.util.FeatureFlags;
1514
import org.opensearch.indices.replication.common.ReplicationType;
1615
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
1716
import org.opensearch.test.InternalTestCluster;
@@ -22,11 +21,6 @@
2221
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
2322
public class AutoExpandSearchReplicasIT extends RemoteStoreBaseIntegTestCase {
2423

25-
@Override
26-
protected Settings featureFlagSettings() {
27-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build();
28-
}
29-
3024
public void testAutoExpandSearchReplica() throws Exception {
3125
String indexName = "test";
3226
internalCluster().startClusterManagerOnlyNode();

‎server/src/internalClusterTest/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.opensearch.action.search.SearchResponse;
1212
import org.opensearch.action.support.WriteRequest;
1313
import org.opensearch.common.settings.Settings;
14-
import org.opensearch.common.util.FeatureFlags;
1514
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
1615
import org.opensearch.test.OpenSearchIntegTestCase;
1716

@@ -28,11 +27,6 @@ public class MetadataIndexStateServiceIT extends RemoteStoreBaseIntegTestCase {
2827

2928
private static final String TEST_INDEX = "test_open_close_index";
3029

31-
@Override
32-
protected Settings featureFlagSettings() {
33-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build();
34-
}
35-
3630
public void testIndexCloseAndOpen() throws Exception {
3731
internalCluster().startClusterManagerOnlyNode();
3832
internalCluster().startDataOnlyNodes(2);

‎server/src/internalClusterTest/java/org/opensearch/indices/replication/SearchReplicaReplicationAndRecoveryIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.opensearch.cluster.metadata.IndexMetadata;
2222
import org.opensearch.cluster.routing.RecoverySource;
2323
import org.opensearch.common.settings.Settings;
24-
import org.opensearch.common.util.FeatureFlags;
2524
import org.opensearch.index.SegmentReplicationPerGroupStats;
2625
import org.opensearch.index.SegmentReplicationShardStats;
2726
import org.opensearch.indices.recovery.RecoveryState;
@@ -72,11 +71,6 @@ public Settings indexSettings() {
7271
.build();
7372
}
7473

75-
@Override
76-
protected Settings featureFlagSettings() {
77-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, true).build();
78-
}
79-
8074
public void testReplication() throws Exception {
8175
internalCluster().startClusterManagerOnlyNode();
8276
final String primary = internalCluster().startDataOnlyNode();

‎server/src/internalClusterTest/java/org/opensearch/indices/replication/SearchReplicaRestoreIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.opensearch.cluster.metadata.IndexMetadata;
1717
import org.opensearch.cluster.metadata.Metadata;
1818
import org.opensearch.common.settings.Settings;
19-
import org.opensearch.common.util.FeatureFlags;
2019
import org.opensearch.index.query.QueryBuilders;
2120
import org.opensearch.indices.replication.common.ReplicationType;
2221
import org.opensearch.remotestore.RemoteSnapshotIT;
@@ -39,11 +38,6 @@ public class SearchReplicaRestoreIT extends RemoteSnapshotIT {
3938
private static final String FS_REPOSITORY_TYPE = "fs";
4039
private static final int DOC_COUNT = 10;
4140

42-
@Override
43-
protected Settings featureFlagSettings() {
44-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, true).build();
45-
}
46-
4741
public void testSearchReplicaRestore_WhenSnapshotOnSegRep_RestoreOnDocRepWithSearchReplica() throws Exception {
4842
bootstrapIndexWithOutSearchReplicas(ReplicationType.SEGMENT);
4943
createRepoAndSnapshot(REPOSITORY_NAME, FS_REPOSITORY_TYPE, SNAPSHOT_NAME, INDEX_NAME);

‎server/src/internalClusterTest/java/org/opensearch/indices/settings/SearchOnlyReplicaFeatureFlagIT.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎server/src/internalClusterTest/java/org/opensearch/indices/settings/SearchOnlyReplicaIT.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.opensearch.cluster.routing.Preference;
1919
import org.opensearch.cluster.routing.ShardRouting;
2020
import org.opensearch.common.settings.Settings;
21-
import org.opensearch.common.util.FeatureFlags;
2221
import org.opensearch.index.query.QueryBuilders;
2322
import org.opensearch.indices.replication.common.ReplicationType;
2423
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
@@ -40,11 +39,6 @@ public class SearchOnlyReplicaIT extends RemoteStoreBaseIntegTestCase {
4039

4140
private static final String TEST_INDEX = "test_index";
4241

43-
@Override
44-
protected Settings featureFlagSettings() {
45-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL, Boolean.TRUE).build();
46-
}
47-
4842
private final String expectedFailureMessage = "To set index.number_of_search_replicas, index.replication.type must be set to SEGMENT";
4943

5044
@Override

‎server/src/main/java/org/opensearch/cluster/ClusterModule.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
import org.opensearch.common.settings.Setting;
8888
import org.opensearch.common.settings.Setting.Property;
8989
import org.opensearch.common.settings.Settings;
90-
import org.opensearch.common.util.FeatureFlags;
9190
import org.opensearch.common.util.concurrent.ThreadContext;
9291
import org.opensearch.common.util.set.Sets;
9392
import org.opensearch.core.ParseField;
@@ -391,9 +390,7 @@ public static Collection<AllocationDecider> createAllocationDeciders(
391390
addAllocationDecider(deciders, new SnapshotInProgressAllocationDecider());
392391
addAllocationDecider(deciders, new RestoreInProgressAllocationDecider());
393392
addAllocationDecider(deciders, new FilterAllocationDecider(settings, clusterSettings));
394-
if (FeatureFlags.READER_WRITER_SPLIT_EXPERIMENTAL_SETTING.get(settings)) {
395-
addAllocationDecider(deciders, new SearchReplicaAllocationDecider());
396-
}
393+
addAllocationDecider(deciders, new SearchReplicaAllocationDecider());
397394
addAllocationDecider(deciders, new SameShardAllocationDecider(settings, clusterSettings));
398395
addAllocationDecider(deciders, new DiskThresholdDecider(settings, clusterSettings));
399396
addAllocationDecider(deciders, new ThrottlingAllocationDecider(settings, clusterSettings));

0 commit comments

Comments
 (0)