fix: dblock for db migration / fix: ejb dist caches

main
Guido Grazioli 2022-01-20 20:56:49 +01:00
parent 4a28e1914e
commit 3df7a1a2e1
No known key found for this signature in database
GPG Key ID: 22C8C31EF2BC093B
2 changed files with 45 additions and 23 deletions

View File

@ -210,7 +210,7 @@
<stateless> <stateless>
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
</stateless> </stateless>
<stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/> <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<pools> <pools>
@ -368,12 +368,13 @@
</subsystem> </subsystem>
<subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/> <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
<subsystem xmlns="urn:jboss:domain:infinispan:12.0"> <subsystem xmlns="urn:jboss:domain:infinispan:12.0">
<cache-container name="ejb" default-cache="passivation" aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan"> <cache-container name="ejb" default-cache="dist" aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
<local-cache name="passivation"> <transport lock-timeout="60000"/>
<distributed-cache name="dist">
<locking isolation="REPEATABLE_READ"/> <locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store passivation="true" purge="false"/> <file-store/>
</local-cache> </distributed-cache>
</cache-container> </cache-container>
<cache-container name="keycloak" modules="org.keycloak.keycloak-model-infinispan"> <cache-container name="keycloak" modules="org.keycloak.keycloak-model-infinispan">
<transport lock-timeout="60000"/> <transport lock-timeout="60000"/>
@ -383,8 +384,7 @@
<local-cache name="users"> <local-cache name="users">
<heap-memory size="10000"/> <heap-memory size="10000"/>
</local-cache> </local-cache>
<local-cache name="authenticationSessions"/> {% for cachename in [ "sessions", "offlineSessions", "clientSessions", "offlineClientSessions", "loginFailures", "actionTokens", "authenticationSessions" ] %}
{% for cachename in [ "sessions", "offlineSessions", "clientSessions", "offlineClientSessions", "loginFailures", "actionTokens" ] %}
<distributed-cache name="{{ cachename }}"> <distributed-cache name="{{ cachename }}">
<remote-store cache="{{ cachename }}" <remote-store cache="{{ cachename }}"
remote-servers="remote-cache" remote-servers="remote-cache"
@ -440,33 +440,37 @@
<expiration max-idle="3600000"/> <expiration max-idle="3600000"/>
</local-cache> </local-cache>
</cache-container> </cache-container>
<cache-container name="server" default-cache="default" modules="org.wildfly.clustering.server"> <cache-container name="server" default-cache="default" aliases="singleton cluster" modules="org.wildfly.clustering.server">
<local-cache name="default"> <transport lock-timeout="60000"/>
<replicated-cache name="default">
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
</local-cache> </replicated-cache>
</cache-container> </cache-container>
<cache-container name="web" default-cache="passivation" modules="org.wildfly.clustering.web.infinispan"> <cache-container name="web" default-cache="dist" modules="org.wildfly.clustering.web.infinispan">
<local-cache name="passivation"> <transport lock-timeout="60000"/>
<replicated-cache name="sso">
<locking isolation="REPEATABLE_READ"/> <locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store passivation="true" purge="false"/> </replicated-cache>
</local-cache> <distributed-cache name="dist">
<local-cache name="sso">
<locking isolation="REPEATABLE_READ"/> <locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
</local-cache> <file-store/>
<local-cache name="routing"/> </distributed-cache>
<distributed-cache name="routing"/>
</cache-container> </cache-container>
<cache-container name="hibernate" modules="org.infinispan.hibernate-cache"> <cache-container name="hibernate" modules="org.infinispan.hibernate-cache">
<local-cache name="entity"> <transport lock-timeout="60000"/>
<heap-memory size="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="local-query"> <local-cache name="local-query">
<heap-memory size="10000"/> <heap-memory size="10000"/>
<expiration max-idle="100000"/> <expiration max-idle="100000"/>
</local-cache> </local-cache>
<local-cache name="timestamps"/> <invalidation-cache name="entity">
<transaction mode="NON_XA"/>
<heap-memory size="10000"/>
<expiration max-idle="100000"/>
</invalidation-cache>
<replicated-cache name="timestamps"/>
</cache-container> </cache-container>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:io:3.0"> <subsystem xmlns="urn:jboss:domain:io:3.0">
@ -547,6 +551,15 @@
<cacheTemplates>true</cacheTemplates> <cacheTemplates>true</cacheTemplates>
<dir>${jboss.home.dir}/themes</dir> <dir>${jboss.home.dir}/themes</dir>
</theme> </theme>
{% if keycloak_ha_enabled %}
<spi name="dblock">
<provider name="jpa" enabled="true">
<properties>
<property name="lockWaitTimeout" value="900"/>
</properties>
</provider>
</spi>
{% endif %}
<spi name="eventsStore"> <spi name="eventsStore">
<provider name="jpa" enabled="true"> <provider name="jpa" enabled="true">
<properties> <properties>

View File

@ -446,6 +446,15 @@
<cacheTemplates>true</cacheTemplates> <cacheTemplates>true</cacheTemplates>
<dir>${jboss.home.dir}/themes</dir> <dir>${jboss.home.dir}/themes</dir>
</theme> </theme>
{% if keycloak_ha_enabled %}
<spi name="dblock">
<provider name="jpa" enabled="true">
<properties>
<property name="lockWaitTimeout" value="900"/>
</properties>
</provider>
</spi>
{% endif %}
<spi name="eventsStore"> <spi name="eventsStore">
<provider name="jpa" enabled="true"> <provider name="jpa" enabled="true">
<properties> <properties>