Gehel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339455 )
Change subject: elasticsearch: remove memory lock, we do not use swap anyway Bug: T155578 ...................................................................... elasticsearch: remove memory lock, we do not use swap anyway Bug: T155578 Change-Id: I65f363c6b04e47d6ba0a7244d9bbc7ed092a5940 --- M modules/elasticsearch/templates/elasticsearch_5.erb M modules/elasticsearch/templates/elasticsearch_5.yml.erb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Gehel: Looks good to me, approved diff --git a/modules/elasticsearch/templates/elasticsearch_5.erb b/modules/elasticsearch/templates/elasticsearch_5.erb index 6c2331f..005a48f 100644 --- a/modules/elasticsearch/templates/elasticsearch_5.erb +++ b/modules/elasticsearch/templates/elasticsearch_5.erb @@ -56,7 +56,7 @@ # in elasticsearch.yml. # When using Systemd, the LimitMEMLOCK property must be set # in /usr/lib/systemd/system/elasticsearch.service -MAX_LOCKED_MEMORY=unlimited +#MAX_LOCKED_MEMORY=unlimited # Maximum number of VMA (Virtual Memory Areas) a process can own # When using Systemd, this setting is ignored and the 'vm.max_map_count' diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb b/modules/elasticsearch/templates/elasticsearch_5.yml.erb index d55ee9b..23e84a6 100644 --- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb +++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb @@ -179,7 +179,7 @@ # # Set this property to true to lock the memory: # -bootstrap.memory_lock: true +bootstrap.memory_lock: false # we don't have swap anyway # Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set # to the same value, and that the machine has enough memory to allocate -- To view, visit https://gerrit.wikimedia.org/r/339455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65f363c6b04e47d6ba0a7244d9bbc7ed092a5940 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: DCausse <dcau...@wikimedia.org> Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
