Merge pull request #404 from rhusar/CLOUD-4211

CLOUD-4211 Cloud clustering profiles should configure a distributed cache instead of a replicated one
wildfly · Jun 26, 2024 · 72f8fab · 72f8fab
2 parents ba702f9 + fb86b5f
commit 72f8fab
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 72 deletions.
diff --git a/.github/workflows/test-wildfly-cloud-fp.yml b/.github/workflows/test-wildfly-cloud-fp.yml
@@ -63,7 +63,7 @@ jobs:
         if: env.IMPACT_CLOUD_FP == 'true'
         run: |
           echo Using "${FORK_REPO%%/*}" and "${GITHUB_HEAD_REF##*/}" to build cloud feature-pack
-          mvn clean install -DskipTests -Dwildfly.cekit.modules.fork="${FORK_REPO%%/*}" -Dwildfly.cekit.modules.tag="${GITHUB_HEAD_REF##*/}"
+          mvn clean install --batch-mode --no-transfer-progress -DskipTests -Dwildfly.cekit.modules.fork="${FORK_REPO%%/*}" -Dwildfly.cekit.modules.tag="${GITHUB_HEAD_REF##*/}"
           cloudVersion=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "CLOUD_FP_VERSION=${cloudVersion}" >> $GITHUB_ENV
           mkdir -p custom-cloud-image

diff --git a/...pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml b/...pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature-group-spec name="os-infinispan-dist-web" xmlns="urn:jboss:galleon:feature-group:1.0">
     <feature-group name="infinispan-dist-web"/>
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </feature-group-spec>
diff --git a/...ayers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml b/...ayers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
diff --git a/...s/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml b/...s/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature-group-spec name="os-infinispan-web-sessions-cache" xmlns="urn:jboss:galleon:feature-group:1.0">
+    <feature spec="subsystem.infinispan">
+        <feature spec="subsystem.infinispan.cache-container">
+            <param name="cache-container" value="web"/>
+            <param name="default-cache" value="sessions"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="sessions"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
+            </feature>
+        </feature>
+    </feature>
+</feature-group-spec>
diff --git a/...-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml b/...-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml
@@ -5,23 +5,24 @@
 
     <feature-group name="infinispan-dist-ejb">
         <include feature-id="subsystem.infinispan.cache-container:cache-container=ejb">
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.memory.heap">
+            <param name="default-cache" value="beans"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="beans"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.memory.heap">
                     <param name="size" value="10000"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.locking">
                     <param name="isolation" value="REPEATABLE_READ"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.transaction">
                     <param name="mode" value="BATCH"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
                     <param name="interval" value="0"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.store.file">
+                    <param name="passivation" value="true"/>
+                    <param name="purge" value="true"/>
                 </feature>
             </feature>
         </include>

diff --git a/...ayers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml b/...ayers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
@@ -13,5 +13,5 @@
     <exclude feature-id="subsystem.jgroups.stack.protocol:stack=udp,protocol=PING"/>
     <exclude feature-id="subsystem.jgroups.stack.protocol.MPING:stack=tcp"/>
 
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </layer-spec>
diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 name: jboss.container.wildfly.galleon.cloud-galleon-pack.layers.clustering
 version: '1.0'
-description: Adjustement for Galleon layers that depends on infinispan and groups.
+description: Adjustment for Galleon layers that depend on Infinispan and JGroups.
 
 execute:
 - script: configure.sh

diff --git a/...leon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml b/...leon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature-group-spec name="os-infinispan-dist-web" xmlns="urn:jboss:galleon:feature-group:1.0">
     <feature-group name="infinispan-dist-web"/>
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </feature-group-spec>
diff --git a/...p-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml b/...p-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature-group-spec name="os-infinispan-web-sessions-cache" xmlns="urn:jboss:galleon:feature-group:1.0">
+    <feature spec="subsystem.infinispan">
+        <feature spec="subsystem.infinispan.cache-container">
+            <param name="cache-container" value="web"/>
+            <param name="default-cache" value="sessions"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="sessions"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
+            </feature>
+        </feature>
+    </feature>
+</feature-group-spec>
diff --git a/...p-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml b/...p-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
diff --git a/...ldfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml b/...ldfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml
@@ -5,23 +5,24 @@
 
     <feature-group name="infinispan-dist-ejb">
         <include feature-id="subsystem.infinispan.cache-container:cache-container=ejb">
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.memory.heap">
+            <param name="default-cache" value="beans"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="beans"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.memory.heap">
                     <param name="size" value="10000"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.locking">
                     <param name="isolation" value="REPEATABLE_READ"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.transaction">
                     <param name="mode" value="BATCH"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
                     <param name="interval" value="0"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.store.file">
+                    <param name="passivation" value="true"/>
+                    <param name="purge" value="true"/>
                 </feature>
             </feature>
         </include>

diff --git a/...p-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml b/...p-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
@@ -21,5 +21,5 @@
     <exclude feature-id="socket-binding-group.socket-binding:socket-binding-group=standard-sockets,socket-binding=jgroups-udp-fd"/>
     <exclude feature-id="socket-binding-group.socket-binding:socket-binding-group=standard-sockets,socket-binding=jgroups-tcp-fd"/>
 
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </layer-spec>