From 0af7a332d1e873cbad882b9c5e1288019744a204 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Tue, 21 May 2024 15:46:19 +0200
Subject: [PATCH] CLOUD-4211 Cloud clustering profiles should configure a
 distributed cache instead of a replicated one.

Currently, our cloud tooling configures clustering in the cloud using a replicated cache mode which is suboptimal as it does not scale.
Such cache mode does not scale and is not suited for applications in the cloud that are supposed to be scalable.
In this mode Infinispan replicates all entries in the cache to all nodes in the cluster.
It doesn't scale, as adding new nodes does not enlarge the cluster capacity.

Moreover, we should relax the isolation level to READ_COMMITTED (from REPEATABLE_READ) and transaction mode to NONE (from BATCH).
---
 .../feature_groups/os-infinispan-dist-web.xml |  2 +-
 .../os-infinispan-web-dist-cache.xml          | 15 ++++++++++++
 .../os-infinispan-web-repl-cache.xml          | 24 -------------------
 .../standalone/web-clustering/layer-spec.xml  |  2 +-
 .../layers/clustering/module.yaml             |  2 +-
 .../feature_groups/os-infinispan-dist-web.xml |  2 +-
 .../os-infinispan-web-dist-cache.xml          | 15 ++++++++++++
 .../os-infinispan-web-repl-cache.xml          | 24 -------------------
 .../standalone/web-clustering/layer-spec.xml  |  2 +-
 9 files changed, 35 insertions(+), 53 deletions(-)
 create mode 100644 jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
 delete mode 100644 jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
 create mode 100644 jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
 delete mode 100644 jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml

diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
index 8f792b09..7fb86f68 100644
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
+++ b/jboss/container/wildfly/galleon/cloud-galleon-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-dist-cache"/>
 </feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
new file mode 100644
index 00000000..1bdbb477
--- /dev/null
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/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-dist-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="dist"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="dist"/>
+                <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/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
deleted file mode 100644
index 049c884e..00000000
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature-group-spec name="os-infinispan-web-repl-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="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
-                    <param name="isolation" value="REPEATABLE_READ"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
-                    <param name="mode" value="BATCH"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
-                    <param name="interval" value="0"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
-                </feature>
-            </feature>
-        </feature>
-    </feature>
-</feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
index af4e8fe5..4c6b44be 100644
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/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-dist-cache"/>
 </layer-spec>
\ No newline at end of file
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
index a93534d7..5ae40d5a 100644
--- 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 depends on Infinispan and JGroups.
 
 execute:
 - script: configure.sh
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
index 8f792b09..7fb86f68 100644
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
+++ b/jboss/container/wildfly/galleon/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-dist-cache"/>
 </feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
new file mode 100644
index 00000000..1bdbb477
--- /dev/null
+++ b/jboss/container/wildfly/galleon/fp-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-dist-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="dist"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="dist"/>
+                <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/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
deleted file mode 100644
index 049c884e..00000000
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature-group-spec name="os-infinispan-web-repl-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="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
-                    <param name="isolation" value="REPEATABLE_READ"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
-                    <param name="mode" value="BATCH"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
-                    <param name="interval" value="0"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
-                </feature>
-            </feature>
-        </feature>
-    </feature>
-</feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
index fda54dd4..6b8b8591 100644
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
+++ b/jboss/container/wildfly/galleon/fp-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-dist-cache"/>
 </layer-spec>
\ No newline at end of file