Merge pull request #14468 from pferraro/WFLY-14935-24.x

WFLY-14935 Infinispan expiration reaper should be enabled if wakeup interval is > 0
wildfly · Jul 14, 2021 · 1e83862 · 1e83862
2 parents 9720427 + ed34310
commit 1e83862
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 1 deletion.
diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/ExpirationServiceConfigurator.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/ExpirationServiceConfigurator.java
@@ -62,7 +62,7 @@ public ExpirationConfiguration get() {
         return new ConfigurationBuilder().expiration()
                 .lifespan(this.lifespan, TimeUnit.MILLISECONDS)
                 .maxIdle(this.maxIdle, TimeUnit.MILLISECONDS)
-                .reaperEnabled((this.lifespan > 0) || (this.maxIdle > 0))
+                .reaperEnabled(this.interval > 0)
                 .wakeUpInterval(this.interval, TimeUnit.MILLISECONDS)
                 .create();
     }

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-ejb.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-ejb.xml
@@ -20,6 +20,9 @@
                 <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.transaction">
                     <param name="mode" value="BATCH"/>
                 </feature>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
                 <feature spec="subsystem.infinispan.cache-container.distributed-cache.store.file">
                     <unset param="relative-to"/>
                 </feature>

diff --git a/...ature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-hibernate.xml b/...ature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-hibernate.xml
@@ -21,6 +21,9 @@
             <feature spec="subsystem.infinispan.cache-container.replicated-cache">
                 <param name="replicated-cache" value="timestamps"/>
                 <param name="mode" value="ASYNC"/>
+                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
             </feature>
             <feature spec="subsystem.infinispan.cache-container.invalidation-cache">
                 <param name="invalidation-cache" value="entity"/>

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-server.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-server.xml
@@ -16,6 +16,9 @@
                 <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>
         </feature>
     </feature>

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-web.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-dist-web.xml
@@ -19,6 +19,9 @@
                 <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.transaction">
                     <param name="mode" value="BATCH"/>
                 </feature>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
                 <feature spec="subsystem.infinispan.cache-container.distributed-cache.store.file">
                     <unset param="relative-to"/>
                 </feature>
@@ -31,9 +34,15 @@
                 <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>
             <feature spec="subsystem.infinispan.cache-container.replicated-cache">
                 <param name="replicated-cache" value="routing"/>
+                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
             </feature>
         </feature>
 

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-ejb.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-ejb.xml
@@ -11,6 +11,9 @@
             <param name="default-cache" value="passivation"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="passivation"/>
+                <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
                 <feature spec="subsystem.infinispan.cache-container.local-cache.store.file">
                     <param name="passivation" value="true"/>
                     <param name="purge" value="false"/>

diff --git a/...ture-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-hibernate.xml b/...ture-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-hibernate.xml
@@ -25,6 +25,9 @@
             </feature>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="timestamps"/>
+                <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
             </feature>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="pending-puts"/>

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-server.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-server.xml
@@ -10,6 +10,9 @@
             <param name="default-cache" value="default"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="default"/>
+                <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
             </feature>
         </feature>
     </feature>

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-web.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/infinispan-local-web.xml
@@ -9,6 +9,9 @@
             <param name="default-cache" value="passivation"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="passivation"/>
+                <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
                 <feature spec="subsystem.infinispan.cache-container.local-cache.store.file">
                     <param name="passivation" value="true"/>
                     <param name="purge" value="false"/>
@@ -17,6 +20,9 @@
             </feature>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="sso"/>
+                <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
             </feature>
         </feature>
     </feature>