openstack/puppet-heat
Code Issues Proposed changes

Merge "Add cache client retry options for the pymemcache backend"

Browse Source
This commit is contained in:
Zuul 2022-02-20 18:42:04 +00:00 committed by Gerrit Code Review
commit e0449abe4c
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/cache.pp
View File

@ -167,6 +167,21 @@
# be available. # be available.
# Default to $::os_service_default # Default to $::os_service_default
# #
# [*enable_retry_client*]
# (Optional) Enable retry client mechanisms to handle failure.
# Those mechanisms can be used to wrap all kind of pymemcache
# clients. The wrapper allows you to define how many attempts
# to make and how long to wait between attemots.
# Default to $::os_service_default
#
# [*retry_attempts*]
# (Optional) Number of times to attempt an action before failing.
# Default to $::os_service_default
#
# [*retry_delay*]
# (Optional) Number of seconds to sleep between each attempt.
# Default to $::os_service_default
#
class heat::cache ( class heat::cache (
$config_prefix = $::os_service_default, $config_prefix = $::os_service_default,
$expiration_time = $::os_service_default, $expiration_time = $::os_service_default,
@ -197,6 +212,9 @@ class heat::cache (
$tls_certfile = $::os_service_default, $tls_certfile = $::os_service_default,
$tls_keyfile = $::os_service_default, $tls_keyfile = $::os_service_default,
$tls_allowed_ciphers = $::os_service_default, $tls_allowed_ciphers = $::os_service_default,
$enable_retry_client = $::os_service_default,
$retry_attempts = $::os_service_default,
$retry_delay = $::os_service_default,
) { ) {
include heat::deps include heat::deps
@ -225,6 +243,9 @@ class heat::cache (
tls_certfile => $tls_certfile, tls_certfile => $tls_certfile,
tls_keyfile => $tls_keyfile, tls_keyfile => $tls_keyfile,
tls_allowed_ciphers => $tls_allowed_ciphers, tls_allowed_ciphers => $tls_allowed_ciphers,
enable_retry_client => $enable_retry_client,
retry_attempts => $retry_attempts,
retry_delay => $retry_delay,
} }
heat_config { heat_config {

4
releasenotes/notes/add_cache_retry_options-834d1d634700dbf6.yaml Normal file
View File

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

9
spec/classes/heat_cache_spec.rb
View File

@ -33,6 +33,9 @@ describe 'heat::cache' do
:tls_certfile => '<SERVICE DEFAULT>', :tls_certfile => '<SERVICE DEFAULT>',
:tls_keyfile => '<SERVICE DEFAULT>', :tls_keyfile => '<SERVICE DEFAULT>',
:tls_allowed_ciphers => '<SERVICE DEFAULT>', :tls_allowed_ciphers => '<SERVICE DEFAULT>',
:enable_retry_client => '<SERVICE DEFAULT>',
:retry_attempts => '<SERVICE DEFAULT>',
:retry_delay => '<SERVICE DEFAULT>',
:manage_backend_package => true, :manage_backend_package => true,
) )
is_expected.to contain_heat_config('constraint_validation_cache/caching').with_value('<SERVICE DEFAULT>') is_expected.to contain_heat_config('constraint_validation_cache/caching').with_value('<SERVICE DEFAULT>')
@ -64,6 +67,9 @@ describe 'heat::cache' do
:memcache_pool_unused_timeout => '120', :memcache_pool_unused_timeout => '120',
:memcache_pool_connection_get_timeout => '360', :memcache_pool_connection_get_timeout => '360',
:tls_enabled => false, :tls_enabled => false,
:enable_retry_client => false,
:retry_attempts => 2,
:retry_delay => 0,
:manage_backend_package => false, :manage_backend_package => false,
:constraint_validation_caching => true, :constraint_validation_caching => true,
:constraint_validation_expiration_time => '3600', :constraint_validation_expiration_time => '3600',
@ -98,6 +104,9 @@ describe 'heat::cache' do
:tls_certfile => '<SERVICE DEFAULT>', :tls_certfile => '<SERVICE DEFAULT>',
:tls_keyfile => '<SERVICE DEFAULT>', :tls_keyfile => '<SERVICE DEFAULT>',
:tls_allowed_ciphers => '<SERVICE DEFAULT>', :tls_allowed_ciphers => '<SERVICE DEFAULT>',
:enable_retry_client => false,
:retry_attempts => 2,
:retry_delay => 0,
:manage_backend_package => false, :manage_backend_package => false,
) )
is_expected.to contain_heat_config('constraint_validation_cache/caching').with_value('true') is_expected.to contain_heat_config('constraint_validation_cache/caching').with_value('true')