From 1ec4e5eceb44a5368ff4d3fed5355ee2cbd4755b Mon Sep 17 00:00:00 2001
From: David Hill <dhill@redhat.com>
Date: Fri, 20 Nov 2020 10:43:57 -0500
Subject: [PATCH] Add setting to override max memcached connections

Added MemcachedMaxConnections to allow max connection override as
actually the limit is 8192 connections but in some cases the environment
will create more than 8192 connections to each memcached server.

Closes-Bug: #1911664

Change-Id: Iaef7c01127327f709577bef3d2e96db840ba2b80
(cherry picked from commit bbed1ef736dff02bf54e03dfe72322a6344adc5e)
---
 deployment/memcached/memcached-container-puppet.yaml        | 5 +++++
 .../notes/addmemcachedmaxconnections-b591c0fa39e821f5.yaml  | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/addmemcachedmaxconnections-b591c0fa39e821f5.yaml

diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml
index 233b08369e..8f7d067c6d 100644
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@@ -42,6 +42,10 @@ parameters:
                  to use when installed. This can be either a percentage ('50%')
                  or a fixed value ('2048').
     type: string
+  MemcachedMaxConnections:
+    default: 8192
+    description: The maximum number of connections to be accepted by memcached
+    type: number
   MonitoringSubscriptionMemcached:
     default: 'overcloud-memcached'
     type: string
@@ -155,6 +159,7 @@ outputs:
                     "%{hiera('$NETWORK_uri')}"
                   params:
                     $NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
+            memcached::max_connections: {get_param: MemcachedMaxConnections}
             memcached::max_memory: {get_param: MemcachedMaxMemory}
             # https://access.redhat.com/security/cve/cve-2018-1000115
             # Only accept TCP to avoid spoofed traffic amplification DoS on UDP.
diff --git a/releasenotes/notes/addmemcachedmaxconnections-b591c0fa39e821f5.yaml b/releasenotes/notes/addmemcachedmaxconnections-b591c0fa39e821f5.yaml
new file mode 100644
index 0000000000..bb8e273bbb
--- /dev/null
+++ b/releasenotes/notes/addmemcachedmaxconnections-b591c0fa39e821f5.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added ``MemcachedMaxConnections`` setting with a default of 8192 maximum
+    connections in order to allow an operator to override that value in
+    environments where memcached is heavily sollicited.