Ottomata has submitted this change and it was merged. Change subject: Make elasticsearch.yml match packaged version. ......................................................................
Make elasticsearch.yml match packaged version. We've made some changes to elasticsearch.yml with puppet. There have been some changes to the packaged version, entirely in comments, that we should incorporate into the version that we install. If we don't, the comments will be confusing. Change-Id: Ib9b092cc38203251113354634888df8563010c2c --- M modules/elasticsearch/templates/elasticsearch.yml.erb 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/elasticsearch/templates/elasticsearch.yml.erb b/modules/elasticsearch/templates/elasticsearch.yml.erb index 1ca97e8..7474d50 100644 --- a/modules/elasticsearch/templates/elasticsearch.yml.erb +++ b/modules/elasticsearch/templates/elasticsearch.yml.erb @@ -280,9 +280,10 @@ # # cluster.routing.allocation.node_concurrent_recoveries: 2 -# Set to throttle throughput when recovering (eg. 100mb, by default unlimited): +# Set to throttle throughput when recovering (eg. 100mb, by default 20mb): # -# indices.recovery.max_size_per_sec: 0 +# indices.recovery.max_bytes_per_sec: 20mb + # Set to limit the number of open concurrent streams when # recovering a shard from a peer: @@ -322,7 +323,7 @@ # 2. Configure an initial list of master nodes in the cluster # to perform discovery when new nodes (master or data) are started: # -# discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"] +# discovery.zen.ping.unicast.hosts: ["host1", "host2:port"] # EC2 discovery allows to use AWS EC2 API in order to perform discovery. # -- To view, visit https://gerrit.wikimedia.org/r/84973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9b092cc38203251113354634888df8563010c2c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Manybubbles <[email protected]> Gerrit-Reviewer: Chad <[email protected]> Gerrit-Reviewer: Cmjohnson <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
