Skip to content

Commit 0bfddd4

Browse files
committed
[9.0] Allow a tsdb data stream to rolled over to a logsdb data stream
and the other way around. Backporting #126640 This doesn't make much sense. However, if a data stream's index mode differs from the index mode of most recent backing index, then this can cause confusion. Typically, misconfiguration is a reason this can happen. Related to #126637
1 parent 007c82a commit 0bfddd4

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*/
99
package org.elasticsearch.cluster.metadata;
1010

11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1113
import org.apache.lucene.document.LongPoint;
1214
import org.apache.lucene.index.LeafReader;
1315
import org.apache.lucene.index.PointValues;
@@ -68,6 +70,8 @@
6870

6971
public final class DataStream implements SimpleDiffable<DataStream>, ToXContentObject, IndexAbstraction {
7072

73+
private static final Logger LOGGER = LogManager.getLogger(DataStream.class);
74+
7175
public static final FeatureFlag FAILURE_STORE_FEATURE_FLAG = new FeatureFlag("failure_store");
7276
public static final TransportVersion ADDED_FAILURE_STORE_TRANSPORT_VERSION = TransportVersions.V_8_12_0;
7377
public static final TransportVersion ADDED_AUTO_SHARDING_EVENT_VERSION = TransportVersions.V_8_14_0;
@@ -575,6 +579,12 @@ public DataStream unsafeRollover(
575579
} else if (dsIndexMode == IndexMode.LOGSDB && (indexModeFromTemplate == null || indexModeFromTemplate == IndexMode.STANDARD)) {
576580
// Allow downgrading a time series data stream to a regular data stream
577581
dsIndexMode = null;
582+
} else if (dsIndexMode == IndexMode.TIME_SERIES && indexModeFromTemplate == IndexMode.LOGSDB) {
583+
dsIndexMode = IndexMode.LOGSDB;
584+
LOGGER.warn("Changing [{}] index mode from [{}] to [{}]", name, indexModeFromTemplate, dsIndexMode);
585+
} else if (dsIndexMode == IndexMode.LOGSDB && indexModeFromTemplate == IndexMode.TIME_SERIES) {
586+
dsIndexMode = IndexMode.TIME_SERIES;
587+
LOGGER.warn("Changing [{}] index mode from [{}] to [{}]", name, indexModeFromTemplate, dsIndexMode);
578588
}
579589

580590
List<Index> backingIndices = new ArrayList<>(this.backingIndices.indices);

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,39 @@ public void testRolloverUpgradeToLogsdbDataStream() {
273273
assertThat(rolledDs.getIndexMode(), equalTo(IndexMode.LOGSDB));
274274
}
275275

276+
public void testRolloverFromTSdbToLogsdb() {
277+
DataStream ds = DataStreamTestHelper.randomInstance().copy().setReplicated(false).setIndexMode(IndexMode.TIME_SERIES).build();
278+
final var project = ProjectMetadata.builder(randomProjectIdOrDefault()).build();
279+
var newCoordinates = ds.nextWriteIndexAndGeneration(project, ds.getDataComponent());
280+
281+
var rolledDs = ds.rollover(new Index(newCoordinates.v1(), UUIDs.randomBase64UUID()), newCoordinates.v2(), IndexMode.LOGSDB, null);
282+
assertThat(rolledDs.getName(), equalTo(ds.getName()));
283+
assertThat(rolledDs.getGeneration(), equalTo(ds.getGeneration() + 1));
284+
assertThat(rolledDs.getIndices().size(), equalTo(ds.getIndices().size() + 1));
285+
assertTrue(rolledDs.getIndices().containsAll(ds.getIndices()));
286+
assertTrue(rolledDs.getIndices().contains(rolledDs.getWriteIndex()));
287+
assertThat(rolledDs.getIndexMode(), equalTo(IndexMode.LOGSDB));
288+
}
289+
290+
public void testRolloverFromLogsdbToTsdb() {
291+
DataStream ds = DataStreamTestHelper.randomInstance().copy().setReplicated(false).setIndexMode(IndexMode.LOGSDB).build();
292+
final var project = ProjectMetadata.builder(randomProjectIdOrDefault()).build();
293+
var newCoordinates = ds.nextWriteIndexAndGeneration(project, ds.getDataComponent());
294+
295+
var rolledDs = ds.rollover(
296+
new Index(newCoordinates.v1(), UUIDs.randomBase64UUID()),
297+
newCoordinates.v2(),
298+
IndexMode.TIME_SERIES,
299+
null
300+
);
301+
assertThat(rolledDs.getName(), equalTo(ds.getName()));
302+
assertThat(rolledDs.getGeneration(), equalTo(ds.getGeneration() + 1));
303+
assertThat(rolledDs.getIndices().size(), equalTo(ds.getIndices().size() + 1));
304+
assertTrue(rolledDs.getIndices().containsAll(ds.getIndices()));
305+
assertTrue(rolledDs.getIndices().contains(rolledDs.getWriteIndex()));
306+
assertThat(rolledDs.getIndexMode(), equalTo(IndexMode.TIME_SERIES));
307+
}
308+
276309
public void testRolloverDowngradeFromTsdbToRegularDataStream() {
277310
DataStream ds = DataStreamTestHelper.randomInstance().copy().setReplicated(false).setIndexMode(IndexMode.TIME_SERIES).build();
278311
var newCoordinates = ds.nextWriteIndexAndGeneration(Metadata.EMPTY_METADATA, ds.getDataComponent());

0 commit comments

Comments
 (0)