Upgrade to Infinispan 14.0.26.Final

Closes keycloak#27871 Signed-off-by: Ryan Emerson <[email protected]> Signed-off-by: Alexander Schwartz <[email protected]> Co-authored-by: Alexander Schwartz <[email protected]>
pedroigor · Mar 13, 2024 · a32808e · a32808e
1 parent 3989cb5
commit a32808e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/docs/guides/high-availability/connect-keycloak-to-external-infinispan.adoc b/docs/guides/high-availability/connect-keycloak-to-external-infinispan.adoc
@@ -23,10 +23,9 @@ This topic describes advanced {jdgserver_name} configurations for {project_name}
 include::examples/src/kcb-infinispan-cache-remote-store-config.xml[tag=keycloak-ispn-remotestore]
 ----
 <1> New tag `<persistence />` to connect it to the remote store.
-<2> This is a workaround for issue https://github.com/keycloak/keycloak/issues/27117[keycloak#27117] and will be removed in the following versions.
-<3> For the address to the remote store, reference two environment variables for host name and port number.
-<4> For authentication, reference two environment variables for username and password.
-<5> To secure the remote store connection, use the Kubernetes mechanisms of the pre-configured truststore.
+<2> For the address to the remote store, reference two environment variables for host name and port number.
+<3> For authentication, reference two environment variables for username and password.
+<4> To secure the remote store connection, use the Kubernetes mechanisms of the pre-configured truststore.
 
 .. Prepare an {jdgserver_name} Cache configuration XML from the file `cache-ispn.xml`, which is part of the {project_name} distribution. 
 For each `replicated-cache` entry, add the tag `<persistence />` as shown below.

diff --git a/docs/guides/high-availability/examples/generated/keycloak-ispn.yaml b/docs/guides/high-availability/examples/generated/keycloak-ispn.yaml
@@ -111,9 +111,6 @@ data:
                                   raw-values="true"
                                   shared="true"
                                   segmented="false">
-                        <!-- This is a workaround for the following issue https://github.com/keycloak/keycloak/issues/27117 and should be removed when the issue is fixed -->
-                        <write-behind modification-queue-size="1024"/>
-                        <!-- End of the workaround -->
                         <remote-server host="${env.KC_REMOTE_STORE_HOST}"
                                        port="${env.KC_REMOTE_STORE_PORT}"/> <!--2-->
                         <connection-pool max-active="16"

diff --git a/docs/guides/high-availability/examples/src/kcb-infinispan-cache-remote-store-config.xml b/docs/guides/high-availability/examples/src/kcb-infinispan-cache-remote-store-config.xml
@@ -53,23 +53,20 @@
                               raw-values="true"
                               shared="true"
                               segmented="false">
-                    <!-- This is a workaround for the following issue https://github.com/keycloak/keycloak/issues/27117 and should be removed when the issue is fixed -->
-                    <write-behind modification-queue-size="1024"/> <!--2-->
-                    <!-- End of the workaround -->
                     <remote-server host="${env.KC_REMOTE_STORE_HOST}"
-                                   port="${env.KC_REMOTE_STORE_PORT}"/> <!--3-->
+                                   port="${env.KC_REMOTE_STORE_PORT}"/> <!--2-->
                     <connection-pool max-active="16"
                                      exhausted-action="CREATE_NEW"/>
                     <security>
                         <authentication server-name="infinispan">
                             <digest username="${env.KC_REMOTE_STORE_USERNAME}"
                                     password="${env.KC_REMOTE_STORE_PASSWORD}"
-                                    realm="default"/> <!--4-->
+                                    realm="default"/> <!--3-->
                         </authentication>
                         <encryption protocol="TLSv1.3"
                                     sni-hostname="${env.KC_REMOTE_STORE_HOST}">
                             <truststore filename="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
-                                        type="pem"/> <!--5-->
+                                        type="pem"/> <!--4-->
                         </encryption>
                     </security>
                 </remote-store>

diff --git a/pom.xml b/pom.xml
@@ -97,7 +97,7 @@
         <h2.version>2.2.224</h2.version>
         <hibernate-orm.plugin.version>6.2.13.Final</hibernate-orm.plugin.version>
         <hibernate.c3p0.version>6.2.13.Final</hibernate.c3p0.version>
-        <infinispan.version>14.0.25.Final</infinispan.version>
+        <infinispan.version>14.0.26.Final</infinispan.version>
 
         <!--JAKARTA-->
         <jakarta.mail.version>2.1.1</jakarta.mail.version>

diff --git a/...main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java b/...main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java
@@ -244,11 +244,7 @@ private void configureRemoteStores(ConfigurationBuilderHolder builder) {
                                 .saslMechanism(SCRAM_SHA_512)
                         .addServer()
                             .host(cacheRemoteHost)
-                            .port(cacheRemotePort)
-                        // This is a workaround for the following issue https://github.com/keycloak/keycloak/issues/27117 and should be removed when the issue is fixed
-                        .async().enable().modificationQueueSize(1024)
-                        // end of workaround
-                ;
+                            .port(cacheRemotePort);
             });
         }
     }