Merge saz/puppet-memcached

.gitignore

@@ -1,3 +1,4 @@
 pkg/
 *.swp
 .forge-releng/
+Gemfile.lock

README.md

@@ -33,6 +33,7 @@ If you find this module useful, send some bitcoins to 1Na3YFUmdxKxJLiuRXQYJU2kiN
 
 * $package_ensure = 'present'
 * $logfile = '/var/log/memcached.log'
+* $pidfile = '/var/run/memcached.pid' (Debian family only, set to false to disable pidfile)
 * $max_memory = false
 * $item_size = false
 * $lock_memory = false (WARNING: good if used intelligently, google for -k key)
@@ -48,3 +49,4 @@ If you find this module useful, send some bitcoins to 1Na3YFUmdxKxJLiuRXQYJU2kiN
 * $processorcount = $::processorcount
 * $service_restart = true (restart service after configuration changes, false to prevent restarts)
 * $use_sasl = false (start memcached with SASL support)
+* $large_mem_pages = false (try to use large memory pages)

manifests/init.pp

@@ -5,6 +5,7 @@
 class memcached (
   $package_ensure  = 'present',
   $logfile         = $::memcached::params::logfile,
+  $pidfile         = '/var/run/memcached.pid',
   $manage_firewall = false,
   $max_memory      = false,
   $item_size       = false,
@@ -22,7 +23,8 @@
   $auto_removal    = false,
   $use_sasl        = false,
   $use_registry    = $::memcached::params::use_registry,
-  $registry_key    = 'HKLM\System\CurrentControlSet\services\memcached\ImagePath'
+  $registry_key    = 'HKLM\System\CurrentControlSet\services\memcached\ImagePath',
+  $large_mem_pages = false
 ) inherits memcached::params {
 
   # validate type and convert string to boolean if necessary

spec/classes/memcached_spec.rb

@@ -60,7 +60,8 @@
       :max_connections => '8192',
       :install_dev     => false,
       :processorcount  => 1,
-      :use_sasl        => false
+      :use_sasl        => false,
+      :large_mem_pages => false,
     }
   end
 
@@ -78,7 +79,8 @@
       :max_connections => '8193',
       :verbosity       => 'vvv',
       :processorcount  => 3,
-      :use_sasl        => true
+      :use_sasl        => true,
+      :large_mem_pages => true,
     },
     {
       :package_ensure  => 'present',
@@ -94,6 +96,12 @@
       :install_dev     => true,
       :processorcount  => 1
     },
+    {
+      :pidfile         => false,
+    },
+    {
+      :pidfile         => '/var/log/memcached.pid',
+    },
     {
       :package_ensure  => 'absent',
       :install_dev     => true
@@ -183,12 +191,18 @@
             if(param_hash[:lock_memory])
               expected_lines.push("-k")
             end
+            if(param_hash[:pidfile])
+              expected_lines.push("-P #{param_hash[:pidfile]}")
+            end
             if(param_hash[:verbosity])
               expected_lines.push("-vvv")
             end
             if(param_hash[:use_sasl])
               expected_lines.push("-S")
             end
+            if(param_hash[:large_mem_pages])
+              expected_lines.push("-L")
+            end
             (content.split("\n") & expected_lines).should =~ expected_lines
           end
         end

templates/memcached.conf.erb

@@ -3,8 +3,10 @@
 # Run memcached as a daemon.
 -d
 
+<% if @pidfile -%>
 # pidfile
--P /var/run/memcached.pid
+-P <%= @pidfile %>
+<% end -%>
 
 # Log memcached's output
 logfile <%= @logfile -%>
@@ -45,6 +47,11 @@ logfile <%= @logfile -%>
 # Run daemon as user
 -u <%= @user %>
 
+<% if @large_mem_pages -%>
+# Try to use large memory pages (if available)
+-L
+<% end -%>
+
 # Limit the number of simultaneous incoming connections.
 -c <%= @max_connections %>
 
@@ -59,4 +66,4 @@ logfile <%= @logfile -%>
 <% if @auto_removal -%>
 # Disable automatic removal of items from the cache when out of memory
 -M
-<% end -%>
+<% end -%>