Skip to content

Commit 8b78ee2

Browse files
authored
[9.0] Avoid warnings for non-system indexes using fast_refresh (#124294) (#124547)
* Avoid warnings for non-system indexes using `fast_refresh` (#124294) * Update LogsdbIndexModeSettingsProvider.java * add test * Update LogsdbIndexModeSettingsProviderTests.java
1 parent a74d288 commit 8b78ee2

File tree

2 files changed

+50
-2
lines changed

2 files changed

+50
-2
lines changed

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ private IndexMetadata buildIndexMetadataForMapperService(
308308
.put(indexTemplateAndCreateRequestSettings)
309309
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, dummyShards)
310310
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, shardReplicas)
311-
.put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID());
311+
.put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
312+
.put(IndexSettings.INDEX_FAST_REFRESH_SETTING.getKey(), false); // Avoid warnings for non-system indexes.
312313

313314
if (templateIndexMode == IndexMode.TIME_SERIES) {
314315
finalResolvedSettings.put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES);

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java

+48-1
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,10 @@ public void testSortAndHostFieldSubobjectsFalse() throws Exception {
11111111
}
11121112

11131113
public void testSortAndHostNameObject() throws Exception {
1114-
var settings = Settings.builder().put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB).build();
1114+
var settings = Settings.builder()
1115+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB)
1116+
.put(IndexSettings.INDEX_FAST_REFRESH_SETTING.getKey(), true)
1117+
.build();
11151118
var mappings = """
11161119
{
11171120
"_doc": {
@@ -1131,4 +1134,48 @@ public void testSortAndHostNameObject() throws Exception {
11311134
assertFalse(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.get(result));
11321135
assertEquals(1, newMapperServiceCounter.get());
11331136
}
1137+
1138+
public void testSortFastRefresh() throws Exception {
1139+
var settings = Settings.builder()
1140+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB)
1141+
.put(IndexSettings.INDEX_FAST_REFRESH_SETTING.getKey(), true)
1142+
.build();
1143+
var mappings = """
1144+
{
1145+
"_doc": {
1146+
"properties": {
1147+
"@timestamp": {
1148+
"type": "date"
1149+
}
1150+
}
1151+
}
1152+
}
1153+
""";
1154+
1155+
String systemIndex = ".security-profile";
1156+
Metadata metadata = Metadata.EMPTY_METADATA;
1157+
var provider = new LogsdbIndexModeSettingsProvider(
1158+
logsdbLicenseService,
1159+
Settings.builder().put("cluster.logsdb.enabled", true).build()
1160+
);
1161+
provider.init(
1162+
im -> MapperTestUtils.newMapperService(xContentRegistry(), createTempDir(), im.getSettings(), im.getIndex().getName()),
1163+
IndexVersion::current,
1164+
() -> Version.CURRENT,
1165+
true,
1166+
true
1167+
);
1168+
var additionalIndexSettings = provider.getAdditionalIndexSettings(
1169+
DataStream.getDefaultBackingIndexName(systemIndex, 0),
1170+
systemIndex,
1171+
IndexMode.LOGSDB,
1172+
metadata,
1173+
Instant.now(),
1174+
settings,
1175+
List.of(new CompressedXContent(mappings))
1176+
);
1177+
1178+
Settings result = builder().put(additionalIndexSettings).build();
1179+
assertTrue(IndexSettings.LOGSDB_SORT_ON_HOST_NAME.get(result));
1180+
}
11341181
}

0 commit comments

Comments
 (0)