From 808dcdfd4d8388c1c8362d56758063efb3d57c94 Mon Sep 17 00:00:00 2001 From: Justin Turner Arthur Date: Wed, 13 Feb 2013 16:59:17 -0600 Subject: [PATCH 1/2] No need to exclude the current node when counting the number of expected nodes. This could trigger early recovery before it's wanted. --- cookbooks/elasticsearch/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb index d9fbfe23..e9999546 100644 --- a/cookbooks/elasticsearch/recipes/default.rb +++ b/cookbooks/elasticsearch/recipes/default.rb @@ -12,7 +12,7 @@ elasticsearch_expected = 0 node['utility_instances'].each do |elasticsearch| if elasticsearch['name'].include?("elasticsearch_") - elasticsearch_expected = elasticsearch_expected + 1 unless node['fqdn'] == elasticsearch['hostname'] + elasticsearch_expected = elasticsearch_expected + 1 elasticsearch_instances << "#{elasticsearch['hostname']}:9300" unless node['fqdn'] == elasticsearch['hostname'] end end From 43ec6d390ef4b6361e0cadf72b1d6f0161161217 Mon Sep 17 00:00:00 2001 From: Justin Turner Arthur Date: Fri, 22 Mar 2013 15:04:33 -0500 Subject: [PATCH 2/2] No need to exclude this node from the unicast discovery list either. See [this discussion](https://github.com/engineyard/ey-cloud-recipes/pull/77#discussion_r3473897) and [this note from @kimchy](http://elasticsearch-users.115913.n3.nabble.com/Replication-basics-tt3649749.html#a3651360). --- cookbooks/elasticsearch/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb index e9999546..5dc8b5c9 100644 --- a/cookbooks/elasticsearch/recipes/default.rb +++ b/cookbooks/elasticsearch/recipes/default.rb @@ -13,7 +13,7 @@ node['utility_instances'].each do |elasticsearch| if elasticsearch['name'].include?("elasticsearch_") elasticsearch_expected = elasticsearch_expected + 1 - elasticsearch_instances << "#{elasticsearch['hostname']}:9300" unless node['fqdn'] == elasticsearch['hostname'] + elasticsearch_instances << "#{elasticsearch['hostname']}:9300" end end end