Skip to content

Commit 38a3c77

Browse files
committed
Put mapping on a single node with new mapping will not wait for the mapping to be applied, closes elastic#1355.
1 parent 3f24997 commit 38a3c77

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ public void putMapping(final PutRequest request, final Listener listener) {
313313
} else {
314314
CompressedString newSource = newMapper.mappingSource();
315315
mappings.put(index, new MappingMetaData(newMapper));
316+
// we also add it to the registered parsed mapping, since that's what we do when we merge
317+
// and, we won't wait for it to be created on this master node
318+
IndexService indexService = indicesService.indexService(index);
319+
indexService.mapperService().add(newMapper.type(), newMapper.mappingSource().string());
316320
if (logger.isDebugEnabled()) {
317321
logger.debug("[{}] create_mapping [{}] with source [{}]", index, newMapper.type(), newSource);
318322
} else if (logger.isInfoEnabled()) {

0 commit comments

Comments
 (0)