Skip to content

[ML] Making indices/aliases hidden takes a while after cluster startup #93148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
droberts195 merged 1 commit into from
Jan 23, 2023
Merged

[ML] Making indices/aliases hidden takes a while after cluster startup #93148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 34 additions & 27 deletions ...rt/src/test/java/org/elasticsearch/xpack/restart/MlHiddenIndicesFullClusterRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,34 +103,41 @@ public void testMlIndicesBecomeHidden() throws Exception {
}
}
} else {
Map<String, Object> indexSettingsMap = contentAsMap(getMlIndicesSettings());
Map<String, Object> aliasesMap = contentAsMap(getMlAliases());

assertThat("Index settings map was: " + indexSettingsMap, indexSettingsMap, is(aMapWithSize(greaterThanOrEqualTo(4))));
for (Map.Entry<String, Object> e : indexSettingsMap.entrySet()) {
String indexName = e.getKey();
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) e.getValue();
assertThat(settings, is(notNullValue()));
assertThat(
"Index " + indexName + " expected to be hidden but wasn't, settings = " + settings,
XContentMapValues.extractValue(settings, "settings", "index", "hidden"),
is(equalTo("true"))
);
}
// The 5 operations in MlInitializationService.makeMlInternalIndicesHidden() run sequentially, so might
// not all be finished when this test runs. The desired state should exist within a few seconds of startup,
// hence the assertBusy().
assertBusy(() -> {
Comment on lines +106 to +109
Copy link
Author

@droberts195 droberts195 Jan 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the changes apart from the comment and the assertBusy() are just auto-formatting changes.

Map<String, Object> indexSettingsMap = contentAsMap(getMlIndicesSettings());
Map<String, Object> aliasesMap = contentAsMap(getMlAliases());

for (Tuple<List<String>, String> indexAndAlias : EXPECTED_INDEX_ALIAS_PAIRS) {
List<String> indices = indexAndAlias.v1();
String alias = indexAndAlias.v2();
assertThat(
indexAndAlias + " expected to be hidden but wasn't, aliasesMap = " + aliasesMap,
indices.stream()
.anyMatch(
index -> Boolean.TRUE.equals(XContentMapValues.extractValue(aliasesMap, index, "aliases", alias, "is_hidden"))
),
is(true)
);
}
assertThat("Index settings map was: " + indexSettingsMap, indexSettingsMap, is(aMapWithSize(greaterThanOrEqualTo(4))));
for (Map.Entry<String, Object> e : indexSettingsMap.entrySet()) {
String indexName = e.getKey();
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) e.getValue();
assertThat(settings, is(notNullValue()));
assertThat(
"Index " + indexName + " expected to be hidden but wasn't, settings = " + settings,
XContentMapValues.extractValue(settings, "settings", "index", "hidden"),
is(equalTo("true"))
);
}

for (Tuple<List<String>, String> indexAndAlias : EXPECTED_INDEX_ALIAS_PAIRS) {
List<String> indices = indexAndAlias.v1();
String alias = indexAndAlias.v2();
assertThat(
indexAndAlias + " expected to be hidden but wasn't, aliasesMap = " + aliasesMap,
indices.stream()
.anyMatch(
index -> Boolean.TRUE.equals(
XContentMapValues.extractValue(aliasesMap, index, "aliases", alias, "is_hidden")
)
),
is(true)
);
}
});
}
}

Expand Down