Gehel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351650 )
Change subject: elasticsearch - fix awareness attribute ...................................................................... elasticsearch - fix awareness attribute awareness_attribute = none is not valid, elasticsearch is looking for an attribute named "none" which does not exists and fails to allocate shards. Empty attribute should work. Change-Id: I064eecb80eca5642dd6e288854088508aee81ff1 --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/elasticsearch/relforge.yaml M modules/elasticsearch/templates/elasticsearch_2.yml.erb M modules/elasticsearch/templates/elasticsearch_5.yml.erb 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Gehel: Looks good to me, approved diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 3295ff3..a3e3824 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -202,7 +202,7 @@ "profile::elasticsearch::recover_after_nodes": 3 "profile::elasticsearch::bulk_thread_pool_executors": 5 "profile::elasticsearch::ferm_srange": '' -"profile::elasticsearch::awareness_attributes": 'none' +"profile::elasticsearch::awareness_attributes": '' "profile::elasticsearch::rack": '' "profile::elasticsearch::row": '' "profile::elasticsearch::unicast_hosts": diff --git a/hieradata/role/common/elasticsearch/relforge.yaml b/hieradata/role/common/elasticsearch/relforge.yaml index e5e5c5d..890650b 100644 --- a/hieradata/role/common/elasticsearch/relforge.yaml +++ b/hieradata/role/common/elasticsearch/relforge.yaml @@ -12,6 +12,6 @@ # T130329 profile::base::check_disk_options: -w 18% -c 15% -l -e -A -i "/srv/sd[a-b][1-3]" --exclude-type=tracefs -profile::elasticsearch::awareness_attributes: 'none' +profile::elasticsearch::awareness_attributes: '' profile::elasticsearch::rack: '' profile::elasticsearch::row: '' diff --git a/modules/elasticsearch/templates/elasticsearch_2.yml.erb b/modules/elasticsearch/templates/elasticsearch_2.yml.erb index 49e7ece..38481ad 100644 --- a/modules/elasticsearch/templates/elasticsearch_2.yml.erb +++ b/modules/elasticsearch/templates/elasticsearch_2.yml.erb @@ -417,7 +417,7 @@ ## # Row/rack awareness attributes ## -<% if @awareness_attributes %>cluster.routing.allocation.awareness.attributes: <%= @awareness_attributes %><% end %> +<% if @awareness_attributes and @awareness_attributes != '' %>cluster.routing.allocation.awareness.attributes: <%= @awareness_attributes %><% end %> <% if @row %>node.row: <%= @row %><% end %> <% if @rack %>node.rack: <%= @rack %><% end %> diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb b/modules/elasticsearch/templates/elasticsearch_5.yml.erb index 5e77a83..1273b04 100644 --- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb +++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb @@ -388,7 +388,7 @@ ## # Row/rack awareness attributes ## -<% if @awareness_attributes %>cluster.routing.allocation.awareness.attributes: <%= @awareness_attributes %><% end %> +<% if @awareness_attributes and @awareness_attributes != '' %>cluster.routing.allocation.awareness.attributes: <%= @awareness_attributes %><% end %> <% if @row %>node.attr.row: <%= @row %><% end %> <% if @rack %>node.attr.rack: <%= @rack %><% end %> -- To view, visit https://gerrit.wikimedia.org/r/351650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I064eecb80eca5642dd6e288854088508aee81ff1 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <[email protected]> Gerrit-Reviewer: DCausse <[email protected]> Gerrit-Reviewer: EBernhardson <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
