Update cluster state with type mapping also for failed indexing request #8692
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.action; | ||
|
|
||
| import org.elasticsearch.ElasticsearchException; | ||
| import org.elasticsearch.ElasticsearchWrapperException; | ||
| import org.elasticsearch.common.Nullable; | ||
|
|
||
|
|
||
| public class WriteFailure extends ElasticsearchException implements ElasticsearchWrapperException { | ||
| @Nullable | ||
|
There was a problem hiding this comment. Why is this nullable when there is an assert forbidding null in the ctor? |
||
| private final String mappingTypeToUpdate; | ||
|
|
||
| public WriteFailure(Throwable cause, String mappingTypeToUpdate) { | ||
| super(null, cause); | ||
| assert cause != null; | ||
| this.mappingTypeToUpdate = mappingTypeToUpdate; | ||
| } | ||
|
|
||
| public String getMappingTypeToUpdate() { | ||
| return mappingTypeToUpdate; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.index.mapper.dynamic; | ||
|
|
||
| import com.google.common.base.Predicate; | ||
| import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; | ||
| import org.elasticsearch.client.Client; | ||
| import org.elasticsearch.index.mapper.StrictDynamicMappingException; | ||
| import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
|
|
||
|
|
||
| public class DynamicMappingIntegrationTests extends ElasticsearchIntegrationTest { | ||
|
|
||
| // https://github.com/elasticsearch/elasticsearch/issues/8423#issuecomment-64229717 | ||
| @Test | ||
| public void testStrictAllMapping() throws Exception { | ||
| String defaultMapping = jsonBuilder().startObject().startObject("_default_") | ||
| .field("dynamic", "strict") | ||
| .endObject().endObject().string(); | ||
| client().admin().indices().prepareCreate("index").addMapping("_default_", defaultMapping).get(); | ||
|
|
||
| try { | ||
| client().prepareIndex("index", "type", "id").setSource("test", "test").get(); | ||
| fail(); | ||
| } catch (StrictDynamicMappingException ex) { | ||
| // this should not be created dynamically so we expect this exception | ||
| } | ||
| awaitBusy(new Predicate<Object>() { | ||
| @Override | ||
| public boolean apply(java.lang.Object input) { | ||
| GetMappingsResponse currentMapping = client().admin().indices().prepareGetMappings("index").get(); | ||
| return currentMapping.getMappings().get("index").get("type") != null; | ||
| } | ||
| }); | ||
|
|
||
| String docMapping = jsonBuilder().startObject().startObject("type") | ||
| .startObject("_all") | ||
| .field("enabled", false) | ||
| .endObject() | ||
| .endObject().endObject().string(); | ||
| try { | ||
| client().admin().indices() | ||
| .preparePutMapping("index") | ||
| .setType("type") | ||
| .setSource(docMapping).get(); | ||
| fail(); | ||
| } catch (Exception e) { | ||
| // the mapping was created anyway with _all enabled: true, although the index request fails so we expect the update to fail | ||
| } | ||
|
|
||
| // make sure type was created | ||
| for (Client client : cluster()) { | ||
| GetMappingsResponse mapping = client.admin().indices().prepareGetMappings("index").setLocal(true).get(); | ||
| assertNotNull(mapping.getMappings().get("index").get("type")); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have any other exception classes that don't end in "Exception"? We should probably stick with that naming scheme..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And I see that this was just extracted out from an inner class, but I think making it public means we should be better with the name.