From ce44bbfadf27a63c3862a74c6addf5153d93c47d Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 28 Mar 2016 12:44:42 -0700 Subject: [PATCH 1/2] [docs] clarify where discovery.zen.minimum_master_node is required https://github.com/elastic/elasticsearch/pull/17288 added a check to enforce that the `discovery.zen.minimum_master_nodes` configuration is set when nodes have the `host`, `port`, or `bind_host` set in either `transport` or general `network` configuration sections. This was documented incorrectly as "nodes that are bound to a non-loopback interface", which lead to confusion as I set `network.host: "localhost"` and the check was still failing. This change updates the docs to detail the actual check. I think it also highlights how complex the check is and the need for a simpler solution. --- docs/reference/migration/migrate_5_0/settings.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/reference/migration/migrate_5_0/settings.asciidoc b/docs/reference/migration/migrate_5_0/settings.asciidoc index 5e524a6a3cc..f96dcc88c82 100644 --- a/docs/reference/migration/migrate_5_0/settings.asciidoc +++ b/docs/reference/migration/migrate_5_0/settings.asciidoc @@ -213,8 +213,8 @@ name of the setting must be prefixed with `es.`. ==== Discovery Settings -The `discovery.zen.minimum_master_node` must bet set for nodes that are bound -to a non-loopback network interface. We see those nodes as in "production" mode and -thus require the setting. - - +The `discovery.zen.minimum_master_node` must bet set for nodes that have +`network.host`, `network.bind_host`, `network.publish_host`, +`transport.host`, `transport.bind_host`, or `transport.publish_host` +configuration options set. We see those nodes as in "production" mode +and thus require the setting. From 4f5f3fe895682358a3ee1175792b5c6cd2d7c4b9 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Tue, 29 Mar 2016 15:25:21 -0400 Subject: [PATCH 2/2] Increase the total number of allowed fields in UpdateMappingIntegrationIT#testDynamicUpdates With restriction for the total number of fields introduced in #17357 this test can fail if a large number of records is randomly selected for indexing. --- .../indices/mapping/UpdateMappingIntegrationIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java index 8e064f46e12..125c4ab4059 100644 --- a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java @@ -66,6 +66,7 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase { settingsBuilder() .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) + .put(MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), Long.MAX_VALUE) ).execute().actionGet(); client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet();