Merge "Add socket keepalive options for the pymemcache backend"

manifests/init.pp

@@ -138,6 +138,28 @@
 #   (Optional) A list of memcached server(s) to use for caching. (list value)
 #   Defaults to $::os_service_default
 #
+# [*cache_enable_socket_keepalive*]
+#   (Optional) Global toggle for the socket keepalive of dogpile's
+#   pymemcache backend
+#   Defaults to $::os_service_default
+#
+# [*cache_socket_keepalive_idle*]
+#   (Optional) The time (in seconds) the connection needs to remain idle
+#   before TCP starts sending keepalive probes. Should be a positive integer
+#   most greater than zero.
+#   Defaults to $::os_service_default
+#
+# [*cache_socket_keepalive_interval*]
+#   (Optional) The time (in seconds) between individual keepalive probes.
+#   Should be a positive integer most greater than zero.
+#   Defaults to $::os_service_default
+#
+# [*cache_socket_keepalive_count*]
+#   (Optional) The maximum number of keepalive probes TCP should send before
+#   dropping the connection. Should be a positive integer most greater than
+#   zero.
+#   Defaults to $::os_service_default
+#
 # [*cache_tls_enabled*]
 #   (Optional) Global toggle for TLS usage when comunicating with
 #   the caching servers.
@@ -295,6 +317,10 @@ class ceilometer(
   $kombu_compression                  = $::os_service_default,
   $cache_backend                      = $::os_service_default,
   $memcache_servers                   = $::os_service_default,
+  $cache_enable_socket_keepalive      = $::os_service_default,
+  $cache_socket_keepalive_idle        = $::os_service_default,
+  $cache_socket_keepalive_interval    = $::os_service_default,
+  $cache_socket_keepalive_count       = $::os_service_default,
   $cache_tls_enabled                  = $::os_service_default,
   $cache_tls_cafile                   = $::os_service_default,
   $cache_tls_certfile                 = $::os_service_default,
@@ -421,6 +447,10 @@ will be removed in a future release.')
   oslo::cache { 'ceilometer_config':
     backend                   => $cache_backend,
     memcache_servers          => $memcache_servers,
+    enable_socket_keepalive   => $cache_enable_socket_keepalive,
+    socket_keepalive_idle     => $cache_socket_keepalive_idle,
+    socket_keepalive_interval => $cache_socket_keepalive_interval,
+    socket_keepalive_count    => $cache_socket_keepalive_count,
     tls_enabled               => $cache_tls_enabled,
     tls_cafile                => $cache_tls_cafile,
     tls_certfile              => $cache_tls_certfile,

releasenotes/notes/add_keepalive_options-3802510b6d4461e1.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add socket keepalive options for the pymemcache (dogpile.cache) backend.

spec/classes/ceilometer_init_spec.rb

@@ -127,6 +127,10 @@ describe 'ceilometer' do
       is_expected.to contain_oslo__cache('ceilometer_config').with(
         :backend                   => '<SERVICE DEFAULT>',
         :memcache_servers          => '<SERVICE DEFAULT>',
+        :enable_socket_keepalive   => '<SERVICE DEFAULT>',
+        :socket_keepalive_idle     => '<SERVICE DEFAULT>',
+        :socket_keepalive_interval => '<SERVICE DEFAULT>',
+        :socket_keepalive_count    => '<SERVICE DEFAULT>',
         :tls_enabled               => '<SERVICE DEFAULT>',
         :tls_cafile                => '<SERVICE DEFAULT>',
         :tls_certfile              => '<SERVICE DEFAULT>',
@@ -166,6 +170,10 @@ describe 'ceilometer' do
         params.merge!(
           :cache_backend                   => 'memcache',
           :memcache_servers                => 'host1:11211,host2:11211',
+          :cache_enable_socket_keepalive   => false,
+          :cache_socket_keepalive_idle     => 1,
+          :cache_socket_keepalive_interval => 1,
+          :cache_socket_keepalive_count    => 1,
           :cache_tls_enabled               => true,
           :manage_backend_package          => false,
         )
@@ -175,6 +183,10 @@ describe 'ceilometer' do
         is_expected.to contain_oslo__cache('ceilometer_config').with(
           :backend                   => 'memcache',
           :memcache_servers          => 'host1:11211,host2:11211',
+          :enable_socket_keepalive   => false,
+          :socket_keepalive_idle     => 1,
+          :socket_keepalive_interval => 1,
+          :socket_keepalive_count    => 1,
           :tls_enabled               => true,
           :manage_backend_package    => false,
         )