From 8a38b17a425b0d30b8bb07d344ea2a715fd5b243 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 14 Dec 2023 17:49:22 +0900
Subject: [PATCH] Support [cache] memcache_pool_flush_on_reconnect

Depends-on: https://review.opendev.org/902861
Change-Id: I047a1139d211b881b18d5a6192a383d62bcd8d9f
---
 manifests/cache.pp                                         | 7 +++++++
 .../memcache_pool_flush_on_reconnect-61eae10c71f896c5.yaml | 5 +++++
 spec/classes/heat_cache_spec.rb                            | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/memcache_pool_flush_on_reconnect-61eae10c71f896c5.yaml

diff --git a/manifests/cache.pp b/manifests/cache.pp
index 6b143b74..6e878b19 100644
--- a/manifests/cache.pp
+++ b/manifests/cache.pp
@@ -103,6 +103,11 @@
 #   client connection. (integer value)
 #   Defaults to $facts['os_service_default']
 #
+# [*memcache_pool_flush_on_reconnect*]
+#   (Optional) Global toggle if memcache will be flushed on reconnect.
+#   (oslo_cache.memcache_pool backend only)
+#   Defaults to $facts['os_service_default']
+#
 # [*manage_backend_package*]
 #   (Optional) Whether to install the backend package for the cache.
 #   Defaults to true
@@ -216,6 +221,7 @@ class heat::cache (
   $memcache_pool_maxsize                 = $facts['os_service_default'],
   $memcache_pool_unused_timeout          = $facts['os_service_default'],
   $memcache_pool_connection_get_timeout  = $facts['os_service_default'],
+  $memcache_pool_flush_on_reconnect      = $facts['os_service_default'],
   $manage_backend_package                = true,
   $constraint_validation_caching         = $facts['os_service_default'],
   $constraint_validation_expiration_time = $facts['os_service_default'],
@@ -256,6 +262,7 @@ class heat::cache (
     memcache_pool_maxsize                => $memcache_pool_maxsize,
     memcache_pool_unused_timeout         => $memcache_pool_unused_timeout,
     memcache_pool_connection_get_timeout => $memcache_pool_connection_get_timeout,
+    memcache_pool_flush_on_reconnect     => $memcache_pool_flush_on_reconnect,
     manage_backend_package               => $manage_backend_package,
     tls_enabled                          => $tls_enabled,
     tls_cafile                           => $tls_cafile,
diff --git a/releasenotes/notes/memcache_pool_flush_on_reconnect-61eae10c71f896c5.yaml b/releasenotes/notes/memcache_pool_flush_on_reconnect-61eae10c71f896c5.yaml
new file mode 100644
index 00000000..533cb17d
--- /dev/null
+++ b/releasenotes/notes/memcache_pool_flush_on_reconnect-61eae10c71f896c5.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``heat::cache::memcache_pool_flush_on_reconnect`` parameter has
+    been added.
diff --git a/spec/classes/heat_cache_spec.rb b/spec/classes/heat_cache_spec.rb
index 6d8c4c90..ff37e420 100644
--- a/spec/classes/heat_cache_spec.rb
+++ b/spec/classes/heat_cache_spec.rb
@@ -28,6 +28,7 @@ describe 'heat::cache' do
           :memcache_pool_maxsize                => '<SERVICE DEFAULT>',
           :memcache_pool_unused_timeout         => '<SERVICE DEFAULT>',
           :memcache_pool_connection_get_timeout => '<SERVICE DEFAULT>',
+          :memcache_pool_flush_on_reconnect     => '<SERVICE DEFAULT>',
           :tls_enabled                          => '<SERVICE DEFAULT>',
           :tls_cafile                           => '<SERVICE DEFAULT>',
           :tls_certfile                         => '<SERVICE DEFAULT>',
@@ -69,6 +70,7 @@ describe 'heat::cache' do
           :memcache_pool_maxsize                 => '10',
           :memcache_pool_unused_timeout          => '120',
           :memcache_pool_connection_get_timeout  => '360',
+          :memcache_pool_flush_on_reconnect      => false,
           :tls_enabled                           => false,
           :enable_retry_client                   => false,
           :retry_attempts                        => 2,
@@ -105,6 +107,7 @@ describe 'heat::cache' do
           :memcache_pool_maxsize                => '10',
           :memcache_pool_unused_timeout         => '120',
           :memcache_pool_connection_get_timeout => '360',
+          :memcache_pool_flush_on_reconnect     => false,
           :tls_enabled                          => false,
           :tls_cafile                           => '<SERVICE DEFAULT>',
           :tls_certfile                         => '<SERVICE DEFAULT>',