From c7bdfb1126d47442f7e12f996eecbb7fab315c2d Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Tue, 29 Mar 2016 10:02:29 +0200 Subject: [PATCH] Add comment why it is safe to check the number of nested fields in MapperService.merge. --- .../java/org/elasticsearch/index/mapper/MapperService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java index eaf897e7fbd07..73b94e60b4694 100755 --- a/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -283,6 +283,11 @@ private synchronized DocumentMapper merge(DocumentMapper mapper, MergeReason rea fullPathObjectMappers = Collections.unmodifiableMap(fullPathObjectMappers); if (reason == MergeReason.MAPPING_UPDATE) { + // this check will only be performed on the master node when there is + // a call to the update mapping API. For all other cases like + // the master node restoring mappings from disk or data nodes + // deserializing cluster state that was sent by the master node, + // this check will be skipped. checkNestedFieldsLimit(fullPathObjectMappers); }