Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLOUD-4211 Cloud clustering profiles should configure a distributed cache instead of a replicated one #404

Merged
merged 4 commits into from
Jun 26, 2024
Merged

CLOUD-4211 Cloud clustering profiles should configure a distributed cache instead of a replicated one #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
270d608
Language fixes in clustering module.yaml.
rhusar Jun 6, 2024
b0277a4
CLOUD-4211 Cloud clustering profiles should configure a distributed c…
rhusar Jun 6, 2024
bda286c
CLOUD-4211 Cloud clustering profiles should configure a distributed c…
rhusar Jun 6, 2024
fb86b5f
CI: add correct Maven options for automated runs to make logs readable.
rhusar Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-wildfly-cloud-fp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
24 changes: 0 additions & 24 deletions ...ayers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions ...s/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
19 changes: 10 additions & 9 deletions ...-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ayers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...leon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
15 changes: 15 additions & 0 deletions ...p-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
24 changes: 0 additions & 24 deletions ...p-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
View file
Open in desktop

This file was deleted.

19 changes: 10 additions & 9 deletions ...ldfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...p-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading