Merge "Add HashClient retry options for the dogpile.cache backend"

manifests/cache.pp

@@ -133,6 +133,22 @@
 #   (Optional) Number of seconds to sleep between each attempt.
 #   Default to $::os_service_default
 #
+# [*hashclient_retry_attempts*]
+#   (Optional) Amount of times a client should be tried
+#   before it is marked dead and removed from the pool in
+#   the HashClient's internal mechanisms.
+#   Default to $::os_service_default
+#
+# [*hashclient_retry_delay*]
+#   (Optional) Time in seconds that should pass between
+#   retry attempts in the HashClient's internal mechanisms.
+#   Default to $::os_service_default
+#
+# [*dead_timeout*]
+#   (Optional) Time in seconds before attempting to add a node
+#   back in the pool in the HashClient's internal mechanisms.
+#   Default to $::os_service_default
+#
 class neutron::cache (
   $config_prefix                        = $::os_service_default,
   $expiration_time                      = $::os_service_default,
@@ -156,6 +172,9 @@ class neutron::cache (
   $enable_retry_client                  = $::os_service_default,
   $retry_attempts                       = $::os_service_default,
   $retry_delay                          = $::os_service_default,
+  $hashclient_retry_attempts            = $::os_service_default,
+  $hashclient_retry_delay               = $::os_service_default,
+  $dead_timeout                         = $::os_service_default,
 ) {
 
   include neutron::deps
@@ -183,5 +202,8 @@ class neutron::cache (
     enable_retry_client                  => $enable_retry_client,
     retry_attempts                       => $retry_attempts,
     retry_delay                          => $retry_delay,
+    hashclient_retry_attempts            => $hashclient_retry_attempts,
+    hashclient_retry_delay               => $hashclient_retry_delay,
+    dead_timeout                         => $dead_timeout,
   }
 }

releasenotes/notes/add_cache_hashclient_retry_options-d40ec799325eb87b.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add options to configure pymemcache's HashClient retrying mechanisms
+    (dogpile.cache) backend.

spec/classes/neutron_cache_spec.rb

@@ -32,6 +32,9 @@ describe 'neutron::cache' do
           :enable_retry_client                  => '<SERVICE DEFAULT>',
           :retry_attempts                       => '<SERVICE DEFAULT>',
           :retry_delay                          => '<SERVICE DEFAULT>',
+          :hashclient_retry_attempts            => '<SERVICE DEFAULT>',
+          :hashclient_retry_delay               => '<SERVICE DEFAULT>',
+          :dead_timeout                         => '<SERVICE DEFAULT>',
           :manage_backend_package               => true,
         )
       end
@@ -56,6 +59,9 @@ describe 'neutron::cache' do
           :enable_retry_client                  => false,
           :retry_attempts                       => 2,
           :retry_delay                          => 0,
+          :hashclient_retry_attempts            => 2,
+          :hashclient_retry_delay               => 1,
+          :dead_timeout                         => 60,
           :manage_backend_package               => false,
         }
       end
@@ -83,6 +89,9 @@ describe 'neutron::cache' do
           :enable_retry_client                  => false,
           :retry_attempts                       => 2,
           :retry_delay                          => 0,
+          :hashclient_retry_attempts            => 2,
+          :hashclient_retry_delay               => 1,
+          :dead_timeout                         => 60,
           :manage_backend_package               => false,
         )
       end