Skip to content
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

Some template alias settings are not persisted on PUT template #63162

Merged
merged 3 commits into from
Oct 13, 2020
Merged

Some template alias settings are not persisted on PUT template #63162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4b119
Copy all the template alias settings
davidkyle Oct 2, 2020
f215de9
Validate template alias cannot have write alias
davidkyle Oct 8, 2020
d9eefa0
Revert "Validate template alias cannot have write alias"
davidkyle Oct 12, 2020
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
9 changes: 7 additions & 2 deletions server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,8 +823,13 @@ static ClusterState innerPutTemplate(final ClusterState currentState, PutRequest
}

for (Alias alias : request.aliases) {
AliasMetadata aliasMetadata = AliasMetadata.builder(alias.name()).filter(alias.filter())
.indexRouting(alias.indexRouting()).searchRouting(alias.searchRouting()).build();
AliasMetadata aliasMetadata = AliasMetadata.builder(alias.name())
.filter(alias.filter())
.indexRouting(alias.indexRouting())
.searchRouting(alias.searchRouting())
.writeIndex(alias.writeIndex())
Copy link
Member

Choose a reason for hiding this comment

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

I actually don't think we should persist this one. Putting a template in place with is_write_index: true will be confusing because only a single index can be marked as the write index. I think we should instead throw an exception if alias.writeIndex() is set to true here (fail early rather than fail late)

Copy link
Member Author

Choose a reason for hiding this comment

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

Makes perfect sense. I added a validation against the alias having is_write_index: true and updated the tests

.isHidden(alias.isHidden())
.build();
templateBuilder.putAlias(aliasMetadata);
}
IndexTemplateMetadata template = templateBuilder.build();
Expand Down
33 changes: 33 additions & 0 deletions ...r/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.elasticsearch.cluster.metadata.MetadataIndexTemplateService.PutRequest;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings;
Expand Down Expand Up @@ -228,6 +229,38 @@ public void testAliasInvalidFilterInvalidJson() throws Exception {
assertThat(errors.get(0).getMessage(), equalTo("failed to parse filter for alias [invalid_alias]"));
}

public void testIndexTemplateWithAlias() throws Exception {
final String templateName = "template_with_alias";
final String aliasName = "alias_with_settings";
PutRequest request = new PutRequest("api", templateName);
request.patterns(singletonList("te*"));
request.mappings("{}");
Alias alias = new Alias(aliasName)
.filter(randomBoolean() ? null : "{\"term\":{\"user_id\":12}}")
.indexRouting(randomBoolean() ? null : "route1")
.searchRouting(randomBoolean() ? null :"route2")
.isHidden(randomBoolean() ? null : randomBoolean())
.writeIndex(randomBoolean() ? null : randomBoolean());
Set<Alias> aliases = new HashSet<>();
aliases.add(alias);
request.aliases(aliases);

List<Throwable> errors = putTemplateDetail(request);
assertThat(errors, is(empty()));

final Metadata metadata = client().admin().cluster().prepareState().get().getState().metadata();
IndexTemplateMetadata template = metadata.templates().get(templateName);
ImmutableOpenMap<String, AliasMetadata> aliasMap = template.getAliases();
assertThat(aliasMap.size(), equalTo(1));
AliasMetadata metaAlias = aliasMap.get(aliasName);
String filterString = metaAlias.filter() == null ? null : metaAlias.filter().string();
assertThat(filterString, equalTo(alias.filter()));
assertThat(metaAlias.indexRouting(), equalTo(alias.indexRouting()));
assertThat(metaAlias.searchRouting(), equalTo(alias.searchRouting()));
assertThat(metaAlias.isHidden(), equalTo(alias.isHidden()));
assertThat(metaAlias.writeIndex(), equalTo(alias.writeIndex()));
}

public void testFindTemplates() throws Exception {
client().admin().indices().prepareDeleteTemplate("*").get(); // Delete all existing templates
putTemplateDetail(new PutRequest("test", "foo-1").patterns(singletonList("foo-*")).order(1));
Expand Down