Skip to content

Commit 608ff67

Browse files
committed
fix setting registration
1 parent 59687e8 commit 608ff67

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2514,7 +2514,9 @@ IndexMetadata build(boolean repair) {
25142514
final IndexMode indexMode = indexModeString != null ? IndexMode.fromString(indexModeString.toLowerCase(Locale.ROOT)) : null;
25152515
final boolean isTsdb = indexMode == IndexMode.TIME_SERIES;
25162516
boolean useTimeSeriesSyntheticId = false;
2517-
if (isTsdb && indexCreatedVersion.onOrAfter(IndexVersions.TIME_SERIES_USE_SYNTHETIC_ID)) {
2517+
if (isTsdb
2518+
&& IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG
2519+
&& indexCreatedVersion.onOrAfter(IndexVersions.TIME_SERIES_USE_SYNTHETIC_ID)) {
25182520
var setting = settings.get(IndexSettings.USE_SYNTHETIC_ID.getKey());
25192521
if (setting != null && setting.equalsIgnoreCase(Boolean.TRUE.toString())) {
25202522
assert IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG;

server/src/main/java/org/elasticsearch/index/IndexSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
11821182
&& scopedSettings.get(RECOVERY_USE_SYNTHETIC_SOURCE_SETTING);
11831183
useDocValuesSkipper = DOC_VALUES_SKIPPER && scopedSettings.get(USE_DOC_VALUES_SKIPPER);
11841184
seqNoIndexOptions = scopedSettings.get(SEQ_NO_INDEX_OPTIONS_SETTING);
1185-
final var useSyntheticId = scopedSettings.get(USE_SYNTHETIC_ID);
1185+
final var useSyntheticId = IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && scopedSettings.get(USE_SYNTHETIC_ID);
11861186
if (indexMetadata.useTimeSeriesSyntheticId() != useSyntheticId) {
11871187
assert false;
11881188
throw new IllegalArgumentException(

0 commit comments

Comments
 (0)