Skip to content

Commit 34466a3

Browse files
nielsbaumannielsbauman
committed
Remove usages of DataStream#getDefaultBackingIndexName 
1 parent 2ae8ec1 commit 34466a3

File tree

13 files changed

+166
-203
lines changed

13 files changed

+166
-203
lines changed

‎modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataDataStreamRolloverServiceTests.java‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,16 @@ public void testRolloverClusterStateForDataStream() throws Exception {
123123
);
124124
long after = testThreadPool.absoluteTimeInMillis();
125125

126-
String sourceIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration());
127-
String newIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration() + 1);
126+
String sourceIndexName = DataStream.getDefaultBackingIndexName(
127+
dataStream.getName(),
128+
dataStream.getGeneration(),
129+
now.toEpochMilli()
130+
);
131+
String newIndexName = DataStream.getDefaultBackingIndexName(
132+
dataStream.getName(),
133+
dataStream.getGeneration() + 1,
134+
now.toEpochMilli()
135+
);
128136
assertEquals(sourceIndexName, rolloverResult.sourceIndexName());
129137
assertEquals(newIndexName, rolloverResult.rolloverIndexName());
130138
ProjectMetadata rolloverMetadata = rolloverResult.clusterState().metadata().getProject(projectId);
@@ -219,8 +227,16 @@ public void testRolloverAndMigrateDataStream() throws Exception {
219227
false
220228
);
221229

222-
String sourceIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration());
223-
String newIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration() + 1);
230+
String sourceIndexName = DataStream.getDefaultBackingIndexName(
231+
dataStream.getName(),
232+
dataStream.getGeneration(),
233+
now.toEpochMilli()
234+
);
235+
String newIndexName = DataStream.getDefaultBackingIndexName(
236+
dataStream.getName(),
237+
dataStream.getGeneration() + 1,
238+
now.toEpochMilli()
239+
);
224240
assertEquals(sourceIndexName, rolloverResult.sourceIndexName());
225241
assertEquals(newIndexName, rolloverResult.rolloverIndexName());
226242
ProjectMetadata rolloverMetadata = rolloverResult.clusterState().metadata().getProject(projectId);
@@ -308,8 +324,16 @@ public void testChangingIndexModeFromTimeSeriesToSomethingElseNoEffectOnExisting
308324
false
309325
);
310326

311-
String sourceIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration());
312-
String newIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration() + 1);
327+
String sourceIndexName = DataStream.getDefaultBackingIndexName(
328+
dataStream.getName(),
329+
dataStream.getGeneration(),
330+
now.toEpochMilli()
331+
);
332+
String newIndexName = DataStream.getDefaultBackingIndexName(
333+
dataStream.getName(),
334+
dataStream.getGeneration() + 1,
335+
now.toEpochMilli()
336+
);
313337
assertEquals(sourceIndexName, rolloverResult.sourceIndexName());
314338
assertEquals(newIndexName, rolloverResult.rolloverIndexName());
315339
ProjectMetadata rolloverMetadata = rolloverResult.clusterState().metadata().getProject(projectId);
@@ -379,8 +403,16 @@ public void testRolloverClusterStateWithBrokenOlderTsdbDataStream() throws Excep
379403
);
380404
long after = testThreadPool.absoluteTimeInMillis();
381405

382-
String sourceIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration());
383-
String newIndexName = DataStream.getDefaultBackingIndexName(dataStream.getName(), dataStream.getGeneration() + 1);
406+
String sourceIndexName = DataStream.getDefaultBackingIndexName(
407+
dataStream.getName(),
408+
dataStream.getGeneration(),
409+
now.toEpochMilli()
410+
);
411+
String newIndexName = DataStream.getDefaultBackingIndexName(
412+
dataStream.getName(),
413+
dataStream.getGeneration() + 1,
414+
now.toEpochMilli()
415+
);
384416
assertEquals(sourceIndexName, rolloverResult.sourceIndexName());
385417
assertEquals(newIndexName, rolloverResult.rolloverIndexName());
386418
ProjectMetadata rolloverMetadata = rolloverResult.clusterState().metadata().getProject(projectId);

‎modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/GetDataStreamsResponseTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.elasticsearch.xcontent.XContentParser;
2626
import org.elasticsearch.xcontent.json.JsonXContent;
2727

28+
import java.time.Instant;
2829
import java.util.List;
2930
import java.util.Map;
3031

@@ -42,10 +43,11 @@ public void testResponseIlmAndDataStreamLifecycleRepresentation() throws Excepti
4243
// configured for them) and the remainder without any ILM policy configured
4344
String dataStreamName = "logs";
4445

45-
Index firstGenerationIndex = new Index(getDefaultBackingIndexName(dataStreamName, 1), UUIDs.base64UUID());
46-
Index secondGenerationIndex = new Index(getDefaultBackingIndexName(dataStreamName, 2), UUIDs.base64UUID());
47-
Index writeIndex = new Index(getDefaultBackingIndexName(dataStreamName, 3), UUIDs.base64UUID());
48-
Index failureStoreIndex = new Index(getDefaultFailureStoreName(dataStreamName, 1, System.currentTimeMillis()), UUIDs.base64UUID());
46+
Instant now = Instant.now();
47+
Index firstGenerationIndex = new Index(getDefaultBackingIndexName(dataStreamName, 1, now.toEpochMilli()), UUIDs.base64UUID());
48+
Index secondGenerationIndex = new Index(getDefaultBackingIndexName(dataStreamName, 2, now.toEpochMilli()), UUIDs.base64UUID());
49+
Index writeIndex = new Index(getDefaultBackingIndexName(dataStreamName, 3, now.toEpochMilli()), UUIDs.base64UUID());
50+
Index failureStoreIndex = new Index(getDefaultFailureStoreName(dataStreamName, 1, now.toEpochMilli()), UUIDs.base64UUID());
4951
List<Index> indices = List.of(firstGenerationIndex, secondGenerationIndex, writeIndex);
5052
List<Index> failureStores = List.of(failureStoreIndex);
5153
{

‎modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ public void testRetentionSkippedWhilstDownsamplingInProgress() {
395395
{
396396
ProjectMetadata.Builder newProjectBuilder = ProjectMetadata.builder(project);
397397

398-
String firstBackingIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
398+
String firstBackingIndex = dataStream.getIndices().getFirst().getName();
399399
IndexMetadata indexMetadata = project.index(firstBackingIndex);
400400
IndexMetadata.Builder indexMetaBuilder = IndexMetadata.builder(indexMetadata);
401401
indexMetaBuilder.settings(
@@ -419,15 +419,15 @@ public void testRetentionSkippedWhilstDownsamplingInProgress() {
419419
assertThat(clientSeenRequests.get(1), instanceOf(DeleteIndexRequest.class));
420420
assertThat(
421421
((DeleteIndexRequest) clientSeenRequests.get(1)).indices()[0],
422-
is(DataStream.getDefaultBackingIndexName(dataStreamName, 2))
422+
DataStreamTestHelper.backingIndexEqualTo(dataStreamName, 2)
423423
);
424424
}
425425

426426
{
427427
// a lack of downsample status (i.e. the default `UNKNOWN`) must not prevent retention
428428
ProjectMetadata.Builder newProjectBuilder = ProjectMetadata.builder(project);
429429

430-
String firstBackingIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
430+
String firstBackingIndex = dataStream.getIndices().getFirst().getName();
431431
IndexMetadata indexMetadata = project.index(firstBackingIndex);
432432
IndexMetadata.Builder indexMetaBuilder = IndexMetadata.builder(indexMetadata);
433433
indexMetaBuilder.settings(
@@ -442,12 +442,12 @@ public void testRetentionSkippedWhilstDownsamplingInProgress() {
442442
assertThat(clientSeenRequests.get(1), instanceOf(DeleteIndexRequest.class));
443443
assertThat(
444444
((DeleteIndexRequest) clientSeenRequests.get(1)).indices()[0],
445-
is(DataStream.getDefaultBackingIndexName(dataStreamName, 2))
445+
DataStreamTestHelper.backingIndexEqualTo(dataStreamName, 2)
446446
);
447447
assertThat(clientSeenRequests.get(2), instanceOf(DeleteIndexRequest.class));
448448
assertThat(
449449
((DeleteIndexRequest) clientSeenRequests.get(2)).indices()[0],
450-
is(DataStream.getDefaultBackingIndexName(dataStreamName, 1))
450+
DataStreamTestHelper.backingIndexEqualTo(dataStreamName, 1)
451451
);
452452
}
453453
}
@@ -1196,8 +1196,8 @@ public void testDownsampling() throws Exception {
11961196
nodesBuilder.masterNodeId(nodeId);
11971197
ClusterState state = ClusterState.builder(ClusterName.DEFAULT).putProjectMetadata(builder).nodes(nodesBuilder).build();
11981198
setState(clusterService, state);
1199-
String firstGenIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
1200-
Index firstGenIndex = clusterService.state().metadata().getProject(projectId).index(firstGenIndexName).getIndex();
1199+
Index firstGenIndex = dataStream.getIndices().getFirst();
1200+
String firstGenIndexName = firstGenIndex.getName();
12011201
Set<Index> affectedIndices = dataStreamLifecycleService.maybeExecuteDownsampling(
12021202
clusterService.state().projectState(projectId),
12031203
dataStream,
@@ -1343,7 +1343,7 @@ public void testDownsamplingWhenTargetIndexNameClashYieldsException() throws Exc
13431343
DiscoveryNodes.Builder nodesBuilder = buildNodes(nodeId);
13441344
// we are the master node
13451345
nodesBuilder.masterNodeId(nodeId);
1346-
String firstGenIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
1346+
String firstGenIndexName = dataStream.getIndices().getFirst().getName();
13471347

13481348
// mark the first generation as read-only already
13491349
IndexMetadata indexMetadata = builder.get(firstGenIndexName);
@@ -1553,7 +1553,7 @@ public void testMaybeExecuteRetentionSuccessfulDownsampledIndex() {
15531553
ClusterState state = downsampleSetup(projectId, dataStreamName, SUCCESS);
15541554
final var project = state.metadata().getProject(projectId);
15551555
DataStream dataStream = project.dataStreams().get(dataStreamName);
1556-
String firstGenIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
1556+
String firstGenIndexName = dataStream.getIndices().getFirst().getName();
15571557
TimeValue dataRetention = dataStream.getDataLifecycle().dataRetention();
15581558

15591559
// Executing the method to be tested:
@@ -1592,7 +1592,7 @@ public void testMaybeExecuteRetentionDownsampledUnknown() {
15921592
ClusterState state = downsampleSetup(projectId, dataStreamName, UNKNOWN);
15931593
final var project = state.metadata().getProject(projectId);
15941594
DataStream dataStream = project.dataStreams().get(dataStreamName);
1595-
String firstGenIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
1595+
String firstGenIndexName = dataStream.getIndices().getFirst().getName();
15961596
TimeValue dataRetention = dataStream.getDataLifecycle().dataRetention();
15971597

15981598
// Executing the method to be tested:
@@ -1626,7 +1626,7 @@ private ClusterState downsampleSetup(ProjectId projectId, String dataStreamName,
16261626
builder.put(dataStream);
16271627

16281628
// Update the first backing index so that is appears to have been downsampled:
1629-
String firstGenIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
1629+
String firstGenIndexName = dataStream.getIndices().getFirst().getName();
16301630
var imd = builder.get(firstGenIndexName);
16311631
var imdBuilder = new IndexMetadata.Builder(imd);
16321632
imdBuilder.settings(Settings.builder().put(imd.getSettings()).put(IndexMetadata.INDEX_DOWNSAMPLE_STATUS.getKey(), status).build());

‎modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/downsampling/DeleteSourceAndAddDownsampleToDSTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void testDownsampleIndexMissingIsNoOp() {
5858
builder.put(dataStream);
5959
ClusterState previousState = ClusterState.builder(ClusterName.DEFAULT).putProjectMetadata(builder).build();
6060

61-
String firstGeneration = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
61+
String firstGeneration = dataStream.getIndices().getFirst().getName();
6262
ClusterState newState = new DeleteSourceAndAddDownsampleToDS(
6363
Settings.EMPTY,
6464
builder.getId(),
@@ -83,7 +83,7 @@ public void testDownsampleIsAddedToDSEvenIfSourceDeleted() {
8383
DataStreamLifecycle.dataLifecycleBuilder().dataRetention(TimeValue.MAX_VALUE).build(),
8484
now
8585
);
86-
String firstGenIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
86+
String firstGenIndex = dataStream.getIndices().getFirst().getName();
8787
String downsampleIndex = "downsample-1s-" + firstGenIndex;
8888
IndexMetadata.Builder downsampleIndexMeta = IndexMetadata.builder(downsampleIndex)
8989
.settings(settings(IndexVersion.current()))
@@ -129,7 +129,7 @@ public void testSourceIndexIsWriteIndexThrowsException() {
129129
now
130130
);
131131
builder.put(dataStream);
132-
String writeIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 3);
132+
String writeIndex = dataStream.getIndices().getLast().getName();
133133
String downsampleIndex = "downsample-1s-" + writeIndex;
134134
IndexMetadata.Builder downsampleIndexMeta = IndexMetadata.builder(downsampleIndex)
135135
.settings(settings(IndexVersion.current()))
@@ -162,7 +162,7 @@ public void testSourceIsDeleteAndDownsampleOriginationDateIsConfigured() {
162162
DataStreamLifecycle.dataLifecycleBuilder().dataRetention(TimeValue.MAX_VALUE).build(),
163163
now
164164
);
165-
String firstGenIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
165+
String firstGenIndex = dataStream.getIndices().getFirst().getName();
166166
String downsampleIndex = "downsample-1s-" + firstGenIndex;
167167
IndexMetadata.Builder downsampleIndexMeta = IndexMetadata.builder(downsampleIndex)
168168
.settings(settings(IndexVersion.current()))
@@ -224,7 +224,7 @@ public void testSourceWithoutLifecycleMetaAndDestWithOriginationDateAlreadyConfi
224224
DataStreamLifecycle.dataLifecycleBuilder().dataRetention(TimeValue.MAX_VALUE).build(),
225225
now
226226
);
227-
String firstGenIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
227+
String firstGenIndex = dataStream.getIndices().getFirst().getName();
228228
String downsampleIndex = "downsample-1s-" + firstGenIndex;
229229
long downsampleOriginationDate = now - randomLongBetween(10_000, 12_000);
230230
IndexMetadata.Builder downsampleIndexMeta = IndexMetadata.builder(downsampleIndex)
@@ -275,7 +275,7 @@ public void testSourceIndexIsDeleteEvenIfNotPartOfDSAnymore() {
275275
DataStreamLifecycle.dataLifecycleBuilder().dataRetention(TimeValue.MAX_VALUE).build(),
276276
now
277277
);
278-
String firstGenIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
278+
String firstGenIndex = dataStream.getIndices().getFirst().getName();
279279
String downsampleIndex = "downsample-1s-" + firstGenIndex;
280280
IndexMetadata.Builder downsampleIndexMeta = IndexMetadata.builder(downsampleIndex)
281281
.settings(settings(IndexVersion.current()))

‎server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceAutoShardingTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -578,16 +578,16 @@ private void assertRolloverResult(
578578
List<Condition<?>> metConditions,
579579
int expectedNumberOfShards
580580
) {
581-
String sourceIndexName = DataStream.getDefaultBackingIndexName(
582-
preRolloverDataStream.getName(),
583-
preRolloverDataStream.getGeneration()
581+
String sourceIndexName = rolloverResult.sourceIndexName();
582+
assertThat(
583+
sourceIndexName,
584+
DataStreamTestHelper.backingIndexEqualTo(preRolloverDataStream.getName(), (int) preRolloverDataStream.getGeneration())
584585
);
585-
String newIndexName = DataStream.getDefaultBackingIndexName(
586-
preRolloverDataStream.getName(),
587-
preRolloverDataStream.getGeneration() + 1
586+
String newIndexName = rolloverResult.rolloverIndexName();
587+
assertThat(
588+
sourceIndexName,
589+
DataStreamTestHelper.backingIndexEqualTo(preRolloverDataStream.getName(), (int) preRolloverDataStream.getGeneration() + 1)
588590
);
589-
assertEquals(sourceIndexName, rolloverResult.sourceIndexName());
590-
assertEquals(newIndexName, rolloverResult.rolloverIndexName());
591591
ProjectMetadata rolloverMetadata = rolloverResult.clusterState().metadata().getProject(projectId);
592592
assertEquals(preRolloverDataStream.getIndices().size() + 1, rolloverMetadata.indices().size());
593593
IndexMetadata rolloverIndexMetadata = rolloverMetadata.index(newIndexName);

0 commit comments

Comments
 (0)