File tree 3 files changed +9
-7
lines changed
internalClusterTest/java/org/opensearch/remotemigration
main/java/org/opensearch/action/admin/indices/shrink
test/java/org/opensearch/action/admin/indices/shrink
3 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -115,8 +115,7 @@ public void testFailResizeIndexWhileDocRepToRemoteStoreMigration() throws Except
115
115
);
116
116
assertEquals (
117
117
ex .getMessage (),
118
- "Index " + resizeType +" is not allowed as remote migration mode is mixed"
119
- + " and index is remote store disabled"
118
+ "Index " + resizeType + " is not allowed as remote migration mode is mixed" + " and index is remote store disabled"
120
119
);
121
120
}
122
121
@@ -203,8 +202,7 @@ public void testFailResizeIndexWhileRemoteStoreToDocRepMigration() throws Except
203
202
);
204
203
assertEquals (
205
204
ex .getMessage (),
206
- "Index " + resizeType +" is not allowed as remote migration mode is mixed"
207
- + " and index is remote store enabled"
205
+ "Index " + resizeType + " is not allowed as remote migration mode is mixed" + " and index is remote store enabled"
208
206
);
209
207
}
210
208
}
Original file line number Diff line number Diff line change @@ -397,11 +397,13 @@ private static void validateRemoteMigrationModeSettings(
397
397
if (compatibilityMode == CompatibilityMode .MIXED ) {
398
398
boolean isRemoteStoreEnabled = sourceIndexMetadata .getSettings ().getAsBoolean (SETTING_REMOTE_STORE_ENABLED , false );
399
399
Direction migrationDirection = clusterSettings .get (RemoteStoreNodeService .MIGRATION_DIRECTION_SETTING );
400
- boolean invalidConfiguration = (migrationDirection == Direction .REMOTE_STORE && isRemoteStoreEnabled == false )
400
+ boolean invalidConfiguration = (migrationDirection == Direction .REMOTE_STORE && isRemoteStoreEnabled == false )
401
401
|| (migrationDirection == Direction .DOCREP && isRemoteStoreEnabled );
402
402
if (invalidConfiguration ) {
403
403
throw new IllegalStateException (
404
- "Index " + type +" is not allowed as remote migration mode is mixed"
404
+ "Index "
405
+ + type
406
+ + " is not allowed as remote migration mode is mixed"
405
407
+ " and index is remote store "
406
408
+ (isRemoteStoreEnabled ? "enabled" : "disabled" )
407
409
);
Original file line number Diff line number Diff line change @@ -683,7 +683,9 @@ public void testResizeFailuresDuringMigration() {
683
683
);
684
684
assertEquals (
685
685
ise .getMessage (),
686
- "Index " + resizeType +" is not allowed as remote migration mode is mixed"
686
+ "Index "
687
+ + resizeType
688
+ + " is not allowed as remote migration mode is mixed"
687
689
+ " and index is remote store "
688
690
+ (isRemoteStoreEnabled ? "enabled" : "disabled" )
689
691
);
You can’t perform that action at this time.
0 commit comments