Skip to content

Add assertBusy for testMappingVersionAfterDynamicMappingUpdate #38579

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

Add assertBusy for testMappingVersionAfterDynamicMappingUpdate #38579

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
13 changes: 11 additions & 2 deletions server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,12 +769,21 @@ public void testDynamicTemplateOrder() throws IOException {
assertThat(index.mapperService().fullName("foo"), instanceOf(KeywordFieldMapper.KeywordFieldType.class));
}

public void testMappingVersionAfterDynamicMappingUpdate() {
public void testMappingVersionAfterDynamicMappingUpdate() throws Exception {
createIndex("test", client().admin().indices().prepareCreate("test").addMapping("type"));
final ClusterService clusterService = getInstanceFromNode(ClusterService.class);
final long previousVersion = clusterService.state().metaData().index("test").getMappingVersion();
client().prepareIndex("test", "type", "1").setSource("field", "text").get();
assertThat(clusterService.state().metaData().index("test").getMappingVersion(), equalTo(1 + previousVersion));
// This assertBusy is necessary. When a mapping update is needed as a document is indexed,
Copy link
Contributor

@jakelandis jakelandis Feb 11, 2019

Choose a reason for hiding this comment

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

Thanks for the detailed message, TIL. However, I think the commit message is sufficient for the detailed explanation. Perhaps a shorter version like:
//ensure that cluster state has been updated

Also, nitpick: s/mapping conflict/required mapping update

// the document is tried, rejected (due to mapping conflict), then a mapping update sent
// off, the document is then *immediately* retried to see if the mapping change has occurred
// quickly enough, and if it has, indexing does not wait for the next cluster state to occur
// before moving ahead. In very rare cases this immediate retry succeeds, which causes the
// indexing request to complete (because it was successful) but the new cluster state to not
// be propagated entirely yet. In that case, we need to wait because the mapping version
// will eventually be updated, it just hasn't been updated *yet*.
assertBusy(() ->
assertThat(clusterService.state().metaData().index("test").getMappingVersion(), equalTo(1 + previousVersion)));
}

}