From deb6a5da4b9a86e7b03af4df8c178cd71cc46200 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 3 Jul 2019 15:25:12 +0800 Subject: [PATCH] Change memcache_socket_timeout to a float see https://review.opendev.org/#/c/519353/ Change-Id: I961ceec3b79ea876a02867482db995fd5499526c Closes-Bug: #1835162 --- manifests/cache.pp | 2 +- .../notes/memcache_socket_timeout-babb40e8ed001caf.yaml | 4 ++++ spec/classes/nova_cache_spec.rb | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/memcache_socket_timeout-babb40e8ed001caf.yaml diff --git a/manifests/cache.pp b/manifests/cache.pp index 01f9e25db..d01fddad5 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -62,7 +62,7 @@ # [*memcache_socket_timeout*] # (Optional) Timeout in seconds for every call to a server. # (dogpile.cache.memcache and oslo_cache.memcache_pool backends only). -# (integer value) +# (floating point value) # Defaults to $::os_service_default # # [*memcache_pool_maxsize*] diff --git a/releasenotes/notes/memcache_socket_timeout-babb40e8ed001caf.yaml b/releasenotes/notes/memcache_socket_timeout-babb40e8ed001caf.yaml new file mode 100644 index 000000000..d6840724d --- /dev/null +++ b/releasenotes/notes/memcache_socket_timeout-babb40e8ed001caf.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + `memcache_socket_timeout` is changed to float value. diff --git a/spec/classes/nova_cache_spec.rb b/spec/classes/nova_cache_spec.rb index 8a3a6e13c..84e4adbcf 100644 --- a/spec/classes/nova_cache_spec.rb +++ b/spec/classes/nova_cache_spec.rb @@ -38,7 +38,7 @@ describe 'nova::cache' do :debug_cache_backend => false, :memcache_servers => ['memcached01:11211', 'memcached02:11211'], :memcache_dead_retry => '60', - :memcache_socket_timeout => '300', + :memcache_socket_timeout => '300.0', :memcache_pool_maxsize => '10', :memcache_pool_unused_timeout => '120', :memcache_pool_connection_get_timeout => '360', @@ -56,7 +56,7 @@ describe 'nova::cache' do is_expected.to contain_nova_config('cache/debug_cache_backend').with_value('false') is_expected.to contain_nova_config('cache/memcache_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_nova_config('cache/memcache_dead_retry').with_value('60') - is_expected.to contain_nova_config('cache/memcache_socket_timeout').with_value('300') + is_expected.to contain_nova_config('cache/memcache_socket_timeout').with_value('300.0') is_expected.to contain_nova_config('cache/memcache_pool_maxsize').with_value('10') is_expected.to contain_nova_config('cache/memcache_pool_unused_timeout').with_value('120') is_expected.to contain_nova_config('cache/memcache_pool_connection_get_timeout').with_value('360')