Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reject Resize index requests. (i.e, split, shrink and… #12686

Merged
merged 12 commits into from
Apr 4, 2024
Merged

Reject Resize index requests. (i.e, split, shrink and… #12686

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c9b0487
Adding checks to reject Resize index requests. i.e, split, shrink and…
Mar 14, 2024
4548951
Adding issue to changelog.md file
Mar 15, 2024
6672cbe
Some structural changes and added UTs to cover all possible configura…
Mar 18, 2024
ace7752
Added IT for ResizeIndex During migration
Mar 19, 2024
f262296
Addressed comments on PR by @gbbafna
Apr 1, 2024
872f742
code refactoring and spotless checks
Apr 1, 2024
60c77ea
Added javadoc and test descriptions
Apr 2, 2024
2789f8c
Merge branch 'main' of https://github.com/opensearch-project/OpenSear…
Apr 3, 2024
da459ae
Refactoring the code
Apr 4, 2024
df2aa33
Spotless apply
Apr 4, 2024
c99e50b
Merge branch 'main' of https://github.com/opensearch-project/OpenSear…
Apr 4, 2024
06ae8c0
Corrected CHANGELOG.md
Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
code refactoring and spotless checks 
Signed-off-by: Shubh Sahu <shubhvs@amazon.com>
  • Loading branch information
Shubh Sahu committed Apr 1, 2024
commit 872f742886fcd06ba7b8afa9f34c07469690dfca
2 changes: 0 additions & 2 deletions ...internalClusterTest/java/org/opensearch/remotemigration/ResizeIndexMigrationTestCase.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
import org.opensearch.client.Client;
import org.opensearch.common.settings.Settings;
import org.opensearch.indices.replication.common.ReplicationType;
import org.opensearch.node.remotestore.RemoteStoreNodeService;
import org.opensearch.test.OpenSearchIntegTestCase;

import java.util.List;
@@ -137,7 +136,6 @@ public void testFailResizeIndexWhileRemoteStoreToDocRepMigration() throws Except
addRemote = false;
String nonRemoteNodeName = internalCluster().startNode();


logger.info("-->Create index on remote node and SETTING_REMOTE_STORE_ENABLED is true. Resize should not happen");
Settings.Builder builder = Settings.builder().put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT);
client.admin()
5 changes: 3 additions & 2 deletions server/src/main/java/org/opensearch/action/admin/indices/shrink/TransportResizeAction.java
View file
Original file line number Diff line number Diff line change
@@ -382,10 +382,11 @@ private static void validateClusterModeSettings(
if (clusterSettings.get(RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING)
.equals(RemoteStoreNodeService.CompatibilityMode.MIXED)) {
boolean isRemoteStoreEnabled = sourceIndexMetadata.getSettings().getAsBoolean(SETTING_REMOTE_STORE_ENABLED, false);
if ((clusterSettings.get(RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING).equals(RemoteStoreNodeService.Direction.REMOTE_STORE)
if ((clusterSettings.get(RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING)
.equals(RemoteStoreNodeService.Direction.REMOTE_STORE)
&& isRemoteStoreEnabled == false)
|| (clusterSettings.get(RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING).equals(RemoteStoreNodeService.Direction.DOCREP)
&& isRemoteStoreEnabled == true)) {
&& isRemoteStoreEnabled == true)) {
throw new IllegalStateException(
"index Resizing for type ["
+ type
2 changes: 1 addition & 1 deletion .../src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java
View file
Original file line number Diff line number Diff line change
@@ -667,7 +667,7 @@ public void testResizeFailuresDuringMigration() {

if (compatibilityMode == CompatibilityMode.MIXED) {
if ((migrationDirection == RemoteStoreNodeService.Direction.REMOTE_STORE && isRemoteStoreEnabled == false)
|| migrationDirection == RemoteStoreNodeService.Direction.DOCREP && isRemoteStoreEnabled == true ){
|| migrationDirection == RemoteStoreNodeService.Direction.DOCREP && isRemoteStoreEnabled == true) {
ClusterState finalState = clusterState;
IllegalStateException ise = expectThrows(
IllegalStateException.class,
Loading