Skip to content

Clean up TransportResizeAction #137471

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

Merged
merged 10 commits into from
Nov 3, 2025
+482 −507
Merged

Clean up TransportResizeAction #137471

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a6974e5
Clean up `TransportResizeAction`
DaveCTurner Oct 31, 2025
6ee2f3d
Merge branch 'main' into 2025/10/31/resize-action-cleanup
DaveCTurner Nov 2, 2025
5019295
Fields can be final
DaveCTurner Nov 2, 2025
b4b9b88
Move test-only `ToXContent` impl to tests
DaveCTurner Nov 2, 2025
d7590a5
ToXContentObject
DaveCTurner Nov 2, 2025
c501fe8
Merge branch 'main' into 2025/10/31/resize-action-cleanup
DaveCTurner Nov 3, 2025
0cb237d
Whitespace
DaveCTurner Nov 3, 2025
4b9a3ad
Reinstate setWaitForActiveShards
DaveCTurner Nov 3, 2025
b31630c
No need for indices admin client here
DaveCTurner Nov 3, 2025
a50a3d5
Random resize type
DaveCTurner Nov 3, 2025
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
12 changes: 6 additions & 6 deletions ...src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBPassthroughIndexingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
import org.elasticsearch.action.admin.indices.shrink.ResizeType;
import org.elasticsearch.action.admin.indices.shrink.TransportResizeAction;
import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.delete.DeleteRequest;
Expand Down Expand Up @@ -44,6 +45,7 @@
import java.util.List;
import java.util.Map;

import static org.elasticsearch.action.admin.indices.ResizeIndexTestUtils.resizeRequest;
import static org.elasticsearch.test.MapMatcher.assertMap;
import static org.elasticsearch.test.MapMatcher.matchesMap;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
Expand Down Expand Up @@ -267,12 +269,10 @@ public void testIndexingGettingAndSearchingShrunkIndex() throws Exception {
assertThat(updateSettingsResponse.isAcknowledged(), is(true));

String shrunkenTarget = "k8s-shrunken";
var shrinkIndexResponse = client().admin()
.indices()
.prepareResizeIndex(sourceIndex, shrunkenTarget)
.setResizeType(ResizeType.SHRINK)
.setSettings(indexSettings(2, 0).build())
.get();
final var shrinkIndexResponse = client().execute(
TransportResizeAction.TYPE,
resizeRequest(ResizeType.SHRINK, sourceIndex, shrunkenTarget, indexSettings(2, 0))
).actionGet();
assertThat(shrinkIndexResponse.isAcknowledged(), is(true));
assertThat(shrinkIndexResponse.index(), equalTo(shrunkenTarget));

Expand Down
103 changes: 56 additions & 47 deletions .../internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import java.util.List;

import static org.elasticsearch.action.admin.indices.ResizeIndexTestUtils.executeResize;
import static org.elasticsearch.action.admin.indices.create.ShrinkIndexIT.assertNoResizeSourceIndexSettings;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
Expand Down Expand Up @@ -67,11 +68,12 @@ public void testCreateCloneIndex() {

final boolean createWithReplicas = randomBoolean();
assertAcked(
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.CLONE)
.setSettings(
Settings.builder().put("index.number_of_replicas", createWithReplicas ? 1 : 0).putNull("index.blocks.write").build()
)
executeResize(
ResizeType.CLONE,
"source",
"target",
Settings.builder().put("index.number_of_replicas", createWithReplicas ? 1 : 0).putNull("index.blocks.write")
)
);
ensureGreen();
assertNoResizeSourceIndexSettings("target");
Expand Down Expand Up @@ -125,9 +127,10 @@ public void testResizeChangeIndexMode() {
Settings.builder().put("index.mode", "lookup").build()
);
for (Settings settings : indexSettings) {
IllegalArgumentException error = expectThrows(IllegalArgumentException.class, () -> {
indicesAdmin().prepareResizeIndex("source", "target").setResizeType(ResizeType.CLONE).setSettings(settings).get();
});
IllegalArgumentException error = expectThrows(
IllegalArgumentException.class,
() -> executeResize(ResizeType.CLONE, "source", "target", Settings.builder().put(settings)).actionGet()
);
assertThat(error.getMessage(), equalTo("can't change setting [index.mode] during resize"));
}
}
Expand All @@ -137,12 +140,15 @@ public void testResizeChangeSyntheticSource() {
.setMapping("@timestamp", "type=date", "host.name", "type=keyword")
.get();
updateIndexSettings(Settings.builder().put("index.blocks.write", true), "source");
IllegalArgumentException error = expectThrows(IllegalArgumentException.class, () -> {
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.CLONE)
.setSettings(Settings.builder().put("index.mapping.source.mode", "synthetic").putNull("index.blocks.write").build())
.get();
});
IllegalArgumentException error = expectThrows(
IllegalArgumentException.class,
() -> executeResize(
ResizeType.CLONE,
"source",
"target",
Settings.builder().put("index.mapping.source.mode", "synthetic").putNull("index.blocks.write")
).actionGet()
);
assertThat(error.getMessage(), containsString("can't change setting [index.mapping.source.mode] during resize"));
}

Expand All @@ -159,26 +165,26 @@ public void testResizeChangeRecoveryUseSyntheticSource() {
)
).setMapping("@timestamp", "type=date", "host.name", "type=keyword").get();
updateIndexSettings(Settings.builder().put("index.blocks.write", true), "source");
IllegalArgumentException error = expectThrows(IllegalArgumentException.class, () -> {
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.CLONE)
.setSettings(
Settings.builder()
.put(
"index.version.created",
IndexVersionUtils.randomVersionBetween(
random(),
IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY,
IndexVersion.current()
)
IllegalArgumentException error = expectThrows(
IllegalArgumentException.class,
() -> executeResize(
ResizeType.CLONE,
"source",
"target",
Settings.builder()
.put(
"index.version.created",
IndexVersionUtils.randomVersionBetween(
random(),
IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY,
IndexVersion.current()
)
.put("index.recovery.use_synthetic_source", true)
.put("index.mode", "logsdb")
.putNull("index.blocks.write")
.build()
)
.get();
});
)
.put("index.recovery.use_synthetic_source", true)
.put("index.mode", "logsdb")
.putNull("index.blocks.write")
).actionGet()
);
// The index.recovery.use_synthetic_source setting requires either index.mode or index.mapping.source.mode
// to be present in the settings. Since these are all unmodifiable settings with a non-deterministic evaluation
// order, any of them may trigger a failure first.
Expand All @@ -196,12 +202,11 @@ public void testResizeChangeIndexSorts() {
.setMapping("@timestamp", "type=date", "host.name", "type=keyword")
.get();
updateIndexSettings(Settings.builder().put("index.blocks.write", true), "source");
ValidationException error = expectThrows(ValidationException.class, () -> {
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.CLONE)
.setSettings(Settings.builder().putList("index.sort.field", List.of("@timestamp")).build())
.get();
});
ValidationException error = expectThrows(
ValidationException.class,
() -> executeResize(ResizeType.CLONE, "source", "target", Settings.builder().putList("index.sort.field", List.of("@timestamp")))
.actionGet()
);
assertThat(error.getMessage(), containsString("can't override index sort when resizing an index"));
}

Expand All @@ -216,11 +221,13 @@ public void testCloneLogsdbIndexWithNonDefaultTimestamp() {
ensureGreen();

// Clone the index
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.CLONE)
executeResize(
ResizeType.CLONE,
"source",
"target",
// We need to explicitly set the number of replicas in case the source has 0 replicas and the cluster has only 1 data node
.setSettings(Settings.builder().put("index.number_of_replicas", numberOfReplicas).build())
.get();
Settings.builder().put("index.number_of_replicas", numberOfReplicas)
).actionGet();

// Verify that the target index has the correct @timestamp mapping
final var targetMappings = indicesAdmin().prepareGetMappings(TEST_REQUEST_TIMEOUT, "target").get();
Expand All @@ -246,11 +253,13 @@ public void testCloneTimeSeriesIndexWithNonDefaultTimestamp() {
ensureGreen();

// Clone the index
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.CLONE)
executeResize(
ResizeType.CLONE,
"source",
"target",
// We need to explicitly set the number of replicas in case the source has 0 replicas and the cluster has only 1 data node
.setSettings(Settings.builder().put("index.number_of_replicas", numberOfReplicas).build())
.get();
Settings.builder().put("index.number_of_replicas", numberOfReplicas)
).actionGet();

// Verify that the target index has the correct @timestamp mapping
final var targetMappings = indicesAdmin().prepareGetMappings(TEST_REQUEST_TIMEOUT, "target").get();
Expand Down
Loading