Skip to content

Commit 6724f05

Browse files
committed
fixing the build
1 parent 1afbf63 commit 6724f05

File tree

9 files changed

+35
-4
lines changed

9 files changed

+35
-4
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,11 @@ protected void masterOperation(
139139
listener.onFailure(new IllegalStateException(message));
140140
return;
141141
}
142-
List<String> dataStreamNames = indexNameExpressionResolver.dataStreamNames(state, IndicesOptions.DEFAULT, request.indices());
142+
List<String> dataStreamNames = indexNameExpressionResolver.dataStreamNames(
143+
state,
144+
IndicesOptions.lenientExpandOpenHidden(),
145+
request.indices()
146+
);
143147
metadataDataStreamsService.updateSettings(projectResolver, request, dataStreamNames, requestSettings, new ActionListener<>() {
144148
@Override
145149
public void onResponse(AcknowledgedResponse acknowledgedResponse) {

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ public DataStream(
203203
: "replicated data streams cannot be marked for lazy rollover";
204204
this.backingIndices = backingIndices;
205205
this.failureIndices = failureIndices;
206+
if (indexTemplateOverrides != null && indexTemplateOverrides.indexPatterns() == null) {
207+
throw new RuntimeException("Here i am");
208+
}
206209
}
207210

208211
public static DataStream read(StreamInput in) throws IOException {

server/src/main/java/org/elasticsearch/cluster/metadata/MetadataDataStreamsService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public void updateSettings(
509509
listener.onResponse(AcknowledgedResponse.TRUE);
510510
return;
511511
}
512-
clusterService.submitUnbatchedStateUpdateTask(
512+
submitUnbatchedTask(
513513
"updating settings on data streams [" + String.join(", ", dataStreamNames) + "]",
514514
new AckedClusterStateUpdateTask(Priority.HIGH, request.masterNodeTimeout(), request.ackTimeout(), listener) {
515515
@Override
@@ -534,6 +534,7 @@ public ClusterState execute(ClusterState currentState) {
534534
// Currently, the only thing we support having in template overrides is settings:
535535
ComposableIndexTemplate indexTemplateOverrides = ComposableIndexTemplate.builder()
536536
.template(Template.builder().settings(mergedSettingsBuilder))
537+
.indexPatterns(List.of())
537538
.build();
538539
DataStream.Builder dataStreamBuilder = dataStream.copy().setIndexTemplateOverrides(indexTemplateOverrides);
539540
projectMetadataBuilder.removeDataStream(dataStreamName);

server/src/test/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsActionTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.cluster.ClusterState;
1717
import org.elasticsearch.cluster.metadata.IndexMetadata;
1818
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
19+
import org.elasticsearch.cluster.metadata.MetadataDataStreamsService;
1920
import org.elasticsearch.cluster.metadata.MetadataUpdateSettingsService;
2021
import org.elasticsearch.cluster.metadata.ProjectId;
2122
import org.elasticsearch.cluster.metadata.ProjectMetadata;
@@ -72,6 +73,7 @@ public void setUp() throws Exception {
7273

7374
final ThreadPool threadPool = mock(ThreadPool.class);
7475
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
76+
MetadataDataStreamsService metadataDataStreamsService = mock(MetadataDataStreamsService.class);
7577
this.action = new TransportUpdateSettingsAction(
7678
transportService,
7779
mock(ClusterService.class),
@@ -80,7 +82,8 @@ public void setUp() throws Exception {
8082
mock(ActionFilters.class),
8183
projectResolver,
8284
indexNameExpressionResolver,
83-
SYSTEM_INDICES
85+
SYSTEM_INDICES,
86+
metadataDataStreamsService
8487
);
8588
}
8689

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,6 +2085,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
20852085
indices,
20862086
generation,
20872087
metadata,
2088+
null,
20882089
isSystem,
20892090
randomBoolean(),
20902091
isSystem,
@@ -2279,6 +2280,7 @@ public void testWriteFailureIndex() {
22792280
randomNonEmptyIndexInstances(),
22802281
randomNonNegativeInt(),
22812282
null,
2283+
null,
22822284
hidden,
22832285
replicated,
22842286
system,
@@ -2297,6 +2299,7 @@ public void testWriteFailureIndex() {
22972299
randomNonEmptyIndexInstances(),
22982300
randomNonNegativeInt(),
22992301
null,
2302+
null,
23002303
hidden,
23012304
replicated,
23022305
system,
@@ -2322,6 +2325,7 @@ public void testWriteFailureIndex() {
23222325
randomNonEmptyIndexInstances(),
23232326
randomNonNegativeInt(),
23242327
null,
2328+
null,
23252329
hidden,
23262330
replicated,
23272331
system,
@@ -2346,6 +2350,7 @@ public void testIsFailureIndex() {
23462350
backingIndices,
23472351
randomNonNegativeInt(),
23482352
null,
2353+
null,
23492354
hidden,
23502355
replicated,
23512356
system,
@@ -2368,6 +2373,7 @@ public void testIsFailureIndex() {
23682373
backingIndices,
23692374
randomNonNegativeInt(),
23702375
null,
2376+
null,
23712377
hidden,
23722378
replicated,
23732379
system,
@@ -2399,6 +2405,7 @@ public void testIsFailureIndex() {
23992405
backingIndices,
24002406
randomNonNegativeInt(),
24012407
null,
2408+
null,
24022409
hidden,
24032410
replicated,
24042411
system,

server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@
5252
import org.elasticsearch.cluster.coordination.JoinTask;
5353
import org.elasticsearch.cluster.coordination.NodeJoinExecutor;
5454
import org.elasticsearch.cluster.coordination.NodeLeftExecutor;
55+
import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
5556
import org.elasticsearch.cluster.metadata.IndexMetadata;
5657
import org.elasticsearch.cluster.metadata.IndexMetadataVerifier;
5758
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
5859
import org.elasticsearch.cluster.metadata.Metadata;
5960
import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
61+
import org.elasticsearch.cluster.metadata.MetadataDataStreamsService;
6062
import org.elasticsearch.cluster.metadata.MetadataDeleteIndexService;
6163
import org.elasticsearch.cluster.metadata.MetadataIndexStateService;
6264
import org.elasticsearch.cluster.metadata.MetadataIndexStateServiceUtils;
@@ -335,6 +337,11 @@ public IndexMetadata verifyIndexMetadata(
335337
indexNameExpressionResolver,
336338
destructiveOperations
337339
);
340+
MetadataDataStreamsService metadataDataStreamsService = new MetadataDataStreamsService(
341+
clusterService,
342+
indicesService,
343+
DataStreamGlobalRetentionSettings.create(clusterSettings)
344+
);
338345
transportUpdateSettingsAction = new TransportUpdateSettingsAction(
339346
transportService,
340347
clusterService,
@@ -343,7 +350,8 @@ public IndexMetadata verifyIndexMetadata(
343350
actionFilters,
344351
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
345352
indexNameExpressionResolver,
346-
EmptySystemIndices.INSTANCE
353+
EmptySystemIndices.INSTANCE,
354+
metadataDataStreamsService
347355
);
348356
transportClusterRerouteAction = new TransportClusterRerouteAction(
349357
transportService,

x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ public void testAction() throws Exception {
176176
indices,
177177
randomLongBetween(0, 1000),
178178
Map.of(),
179+
null,
179180
systemDataStream || randomBoolean(),
180181
replicated,
181182
systemDataStream,

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/DataStreamDeprecationCheckerTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ private DataStream createTestDataStream(
174174
allIndices,
175175
randomNegativeLong(),
176176
Map.of(),
177+
null,
177178
randomBoolean(),
178179
false,
179180
false,
@@ -264,6 +265,7 @@ public void testOldIndicesIgnoredWarningCheck() {
264265
allIndices,
265266
randomNegativeLong(),
266267
Map.of(),
268+
null,
267269
randomBoolean(),
268270
false,
269271
false,
@@ -331,6 +333,7 @@ public void testOldSystemDataStreamIgnored() {
331333
allIndices,
332334
randomNegativeLong(),
333335
Map.of(),
336+
null,
334337
true,
335338
false,
336339
true,

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationCheckerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ public void testOldIndicesCheckDataStreamIndex() {
216216
List.of(indexMetadata.getIndex()),
217217
randomNegativeLong(),
218218
Map.of(),
219+
null,
219220
randomBoolean(),
220221
false,
221222
false,

0 commit comments

Comments
 (0)