Skip to content

Commit 04917c5

Browse files
authored
Avoid warnings for non-system indexes using fast_refresh (#124294)
* Update LogsdbIndexModeSettingsProvider.java * add test
1 parent 444b8ea commit 04917c5

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ private IndexMetadata buildIndexMetadataForMapperService(
309309
.put(indexTemplateAndCreateRequestSettings)
310310
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, dummyShards)
311311
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, shardReplicas)
312-
.put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID());
312+
.put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
313+
.put(IndexSettings.INDEX_FAST_REFRESH_SETTING.getKey(), false); // Avoid warnings for non-system indexes.
313314

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

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,10 @@ public void testSortAndHostFieldSubobjectsFalse() throws Exception {
11141114
}
11151115

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

0 commit comments

Comments
 (0)