From bb85891cc7532e16f7f2e75eeb916f6f2f26c4a9 Mon Sep 17 00:00:00 2001
From: Ryan Emerson <remerson@redhat.com>
Date: Thu, 16 May 2024 09:55:27 +0100
Subject: [PATCH] Deploy Infinispan with maxCount=10000 and num_owners=1.
 Resolves #805

Signed-off-by: Ryan Emerson <remerson@redhat.com>
---
 .../modules/ROOT/pages/running/timeout_tunning.adoc |  7 +++++--
 .../infinispan/ispn-helm/templates/infinispan.yaml  |  4 ++++
 provision/infinispan/ispn-helm/values.yaml          | 13 ++++++++++++-
 .../keycloak/config/kcb-infinispan-cache-config.xml | 12 ++++++++----
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/doc/kubernetes/modules/ROOT/pages/running/timeout_tunning.adoc b/doc/kubernetes/modules/ROOT/pages/running/timeout_tunning.adoc
index 3f1a4fa42..61e51f00a 100644
--- a/doc/kubernetes/modules/ROOT/pages/running/timeout_tunning.adoc
+++ b/doc/kubernetes/modules/ROOT/pages/running/timeout_tunning.adoc
@@ -142,11 +142,13 @@ spec:
   template: |-
     distributedCache:
       mode: "SYNC"
-      owners: 2
+      owners: 1
       statistics: "true"
       *remoteTimeout: "15000"* # <1>
       locking:
         *acquireTimeout: "10000"* # <2>
+      memory:
+        maxCount: 10000
       backups:
         cluster-b:
           backup:
@@ -166,7 +168,8 @@ Change the cache configuration as show and add the attributes (in bold) you want
 
 [source,xml,subs=+quotes]
 ----
-<distributed-cache name="sessions" owners="2" statistics="true" *remote-timeout="15000"*> <!--1-->
+<distributed-cache name="sessions" owners="1" statistics="true" *remote-timeout="15000"*> <!--1-->
+    <memory max-count="10000" />
     <locking *acquire-timeout="10000"*/> <!--2-->
     <backups>
         <backup site="cluster-b" *timeout="15000"*/> <!--3-->
diff --git a/provision/infinispan/ispn-helm/templates/infinispan.yaml b/provision/infinispan/ispn-helm/templates/infinispan.yaml
index 0a085d760..3fccb389b 100644
--- a/provision/infinispan/ispn-helm/templates/infinispan.yaml
+++ b/provision/infinispan/ispn-helm/templates/infinispan.yaml
@@ -143,6 +143,10 @@ spec:
       remoteTimeout: {{ $config.remoteTimeout | default $.Values.cacheDefaults.remoteTimeout }}
       locking:
         acquireTimeout: {{ $config.lockTimeout | default $.Values.cacheDefaults.lockTimeout }}
+      {{- if and $config.memory $config.memory.maxCount }}
+      memory:
+        maxCount: {{ $config.memory.maxCount }}
+      {{- end}}
       stateTransfer:
         chunkSize: 16
       {{ if $.Values.crossdc.enabled }}
diff --git a/provision/infinispan/ispn-helm/values.yaml b/provision/infinispan/ispn-helm/values.yaml
index 4fe91bee0..5d229e9e6 100644
--- a/provision/infinispan/ispn-helm/values.yaml
+++ b/provision/infinispan/ispn-helm/values.yaml
@@ -15,17 +15,28 @@ cacheDefaults:
   lockTimeout: 4000
 caches:
   sessions:
-    owners: 2
+    owners: 1
     mergePolicy: ALWAYS_REMOVE
+    memory:
+      maxCount: 10000
   actionTokens: {}
   authenticationSessions:
     mergePolicy: ALWAYS_REMOVE
   offlineSessions:
+    owners: 1
     mergePolicy: ALWAYS_REMOVE
+    memory:
+      maxCount: 10000
   clientSessions:
+    owners: 1
     mergePolicy: ALWAYS_REMOVE
+    memory:
+      maxCount: 10000
   offlineClientSessions:
+    owners: 1
     mergePolicy: ALWAYS_REMOVE
+    memory:
+      maxCount: 10000
   loginFailures: { }
   work: { }
 crossdc:
diff --git a/provision/minikube/keycloak/config/kcb-infinispan-cache-config.xml b/provision/minikube/keycloak/config/kcb-infinispan-cache-config.xml
index 28b689ea5..ba4f17248 100644
--- a/provision/minikube/keycloak/config/kcb-infinispan-cache-config.xml
+++ b/provision/minikube/keycloak/config/kcb-infinispan-cache-config.xml
@@ -37,19 +37,23 @@
             </encoding>
             <memory max-count="10000"/>
         </local-cache>
-        <distributed-cache name="sessions" owners="2">
+        <distributed-cache name="sessions" owners="1">
+            <memory max-count="10000" />
             <expiration lifespan="-1"/>
         </distributed-cache>
         <distributed-cache name="authenticationSessions" owners="2">
             <expiration lifespan="-1"/>
         </distributed-cache>
-        <distributed-cache name="offlineSessions" owners="2">
+        <distributed-cache name="offlineSessions" owners="1">
+            <memory max-count="10000" />
             <expiration lifespan="-1"/>
         </distributed-cache>
-        <distributed-cache name="clientSessions" owners="2">
+        <distributed-cache name="clientSessions" owners="1">
+            <memory max-count="10000" />
             <expiration lifespan="-1"/>
         </distributed-cache>
-        <distributed-cache name="offlineClientSessions" owners="2">
+        <distributed-cache name="offlineClientSessions" owners="1">
+            <memory max-count="10000" />
             <expiration lifespan="-1"/>
         </distributed-cache>
         <distributed-cache name="loginFailures" owners="2">