Skip to content

[ML] Preserve alias attributes when making them hidden #80148

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

Closed
wants to merge 1 commit into from
Closed

[ML] Preserve alias attributes when making them hidden #80148

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
32 changes: 20 additions & 12 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,27 @@ private void makeMlInternalIndicesHidden() {
IndicesAliasesRequest indicesAliasesRequest = new IndicesAliasesRequest();
for (ObjectObjectCursor<String, List<AliasMetadata>> entry : getAliasesResponse.getAliases()) {
String index = entry.key;
String[] nonHiddenAliases = entry.value.stream()
.filter(metadata -> metadata.isHidden() == null || metadata.isHidden() == false)
.map(AliasMetadata::alias)
.toArray(String[]::new);
if (nonHiddenAliases.length == 0) {
continue;
}
indicesAliasesRequest.addAliasAction(
IndicesAliasesRequest.AliasActions.add()
for (AliasMetadata existingAliasMetadata : entry.value) {
if (existingAliasMetadata.isHidden() == null || existingAliasMetadata.isHidden() == false) {
Copy link
Contributor

@przemekwitek przemekwitek Nov 4, 2021

Choose a reason for hiding this comment

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

FYI: This condition must be reversed. I did that in my PR (#80346) which replaces this one.

Copy link
Author

@droberts195 droberts195 Nov 4, 2021

Choose a reason for hiding this comment

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

Oh dear. I think that invalidates the testing we did on #79123. Please could reopen that PR, apply the fix, and run a few more BWC test jobs that will do real upgrades of 6.8 to 7.16. Assuming they all work that PR can then be closed again.

This was my mistake. Sorry for the inconvenience.

Copy link
Contributor

@przemekwitek przemekwitek Nov 4, 2021

Choose a reason for hiding this comment

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

No problem, I'll repeat the testing on #79123.

continue;
}
IndicesAliasesRequest.AliasActions addReplacementAliasAction = IndicesAliasesRequest.AliasActions.add()
.index(index)
.aliases(entry.value.stream().map(AliasMetadata::alias).toArray(String[]::new))
.isHidden(true)
);
.aliases(existingAliasMetadata.getAlias())
.writeIndex(existingAliasMetadata.writeIndex())
.isHidden(true);
// Be sure to preserve all attributes apart from is_hidden
if (existingAliasMetadata.filteringRequired()) {
addReplacementAliasAction.filter(existingAliasMetadata.getFilter().string());
}
if (existingAliasMetadata.indexRouting() != null) {
addReplacementAliasAction.indexRouting(existingAliasMetadata.indexRouting());
}
if (existingAliasMetadata.searchRouting() != null) {
addReplacementAliasAction.searchRouting(existingAliasMetadata.searchRouting());
}
indicesAliasesRequest.addAliasAction(addReplacementAliasAction);
}
}
if (indicesAliasesRequest.getAliasActions().isEmpty()) {
logger.debug("There are no ML internal aliases that need to be made hidden, [{}]", getAliasesResponse.getAliases());
Expand Down