Tim Starling has submitted this change and it was merged.
Change subject: Keep memcached memory out of swap
......................................................................
Keep memcached memory out of swap
Lock memcache pages into memory, as it doesn't make sense for us to swap
those out.
Change-Id: I366cd5e847d14aba7c6b52471e801ca0f4b113d7
---
A files/memcached/memcached.default
M manifests/memcached.pp
M templates/memcached/memcached.conf.erb
3 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/files/memcached/memcached.default
b/files/memcached/memcached.default
new file mode 100644
index 0000000..0f4e203
--- /dev/null
+++ b/files/memcached/memcached.default
@@ -0,0 +1,2 @@
+ENABLE_MEMCACHED=yes
+ulimit -l unlimited
diff --git a/manifests/memcached.pp b/manifests/memcached.pp
index be5fc01..9d7a550 100644
--- a/manifests/memcached.pp
+++ b/manifests/memcached.pp
@@ -68,6 +68,11 @@
owner => root,
group => root,
mode => 0644;
+ "/etc/default/memcached":
+ source => "puppet:///files/memcached/memcached.default",
+ owner => root,
+ group => root,
+ mode => 0444;
}
}
diff --git a/templates/memcached/memcached.conf.erb
b/templates/memcached/memcached.conf.erb
index 320e6da..0c401d4 100644
--- a/templates/memcached/memcached.conf.erb
+++ b/templates/memcached/memcached.conf.erb
@@ -39,7 +39,7 @@
-c 25000
# Lock down all paged memory. Consult with the README and homepage before you
do this
-# -k
+-k
# Return error when memory is exhausted (rather than removing items)
# -M
--
To view, visit https://gerrit.wikimedia.org/r/23872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I366cd5e847d14aba7c6b52471e801ca0f4b113d7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: gerrit2 <n...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
