libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Upgrade to Infinispan 14.0.4.Final

Browse source
This commit is contained in:
Martin Kanis 2022-12-19 09:53:46 +01:00 committed by Michal Hajas
parent 22e7214565
commit 5aae3842c4
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanNotificationsManager.java
View file

@ -258,11 +258,17 @@ public class InfinispanNotificationsManager {
}); });
} catch (RejectedExecutionException ree) { } catch (RejectedExecutionException ree) {
// server is shutting down or pool was terminated - don't throw errors
if (ree.getMessage() != null && (ree.getMessage().contains("Terminated") || ree.getMessage().contains("Shutting down"))) {
logger.warnf("Rejected submitting of the event for key: %s because server is shutting down or pool was terminated.", key);
logger.debug(ree);
} else {
// avoid touching the cache when creating a log message to avoid a deadlock in Infinispan 12.1.7.Final // avoid touching the cache when creating a log message to avoid a deadlock in Infinispan 12.1.7.Final
logger.errorf("Rejected submitting of the event for key: %s. Server going to shutdown or pool exhausted. Pool: %s", key, listenersExecutor.toString()); logger.errorf("Rejected submitting of the event for key: %s. Server going to shutdown or pool exhausted. Pool: %s", key, listenersExecutor.toString());
throw ree; throw ree;
} }
} }
}
} }

4
model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java
View file

@ -393,7 +393,7 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon
// Used for cross-data centers scenario. Usually integration with external JDG server, which itself handles communication between DCs. // Used for cross-data centers scenario. Usually integration with external JDG server, which itself handles communication between DCs.
private void configureRemoteCacheStore(ConfigurationBuilder builder, boolean async, String cacheName) { private void configureRemoteCacheStore(ConfigurationBuilder builder, boolean async, String cacheName) {
String jdgServer = config.get("remoteStoreHost", "localhost"); String jdgServer = config.get("remoteStoreHost", "127.0.0.1");
Integer jdgPort = config.getInt("remoteStorePort", 11222); Integer jdgPort = config.getInt("remoteStorePort", 11222);
// After upgrade to Infinispan 12.1.7.Final it's required that both remote store and embedded cache use // After upgrade to Infinispan 12.1.7.Final it's required that both remote store and embedded cache use
@ -422,7 +422,7 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon
} }
private void configureRemoteActionTokenCacheStore(ConfigurationBuilder builder, boolean async) { private void configureRemoteActionTokenCacheStore(ConfigurationBuilder builder, boolean async) {
String jdgServer = config.get("remoteStoreHost", "localhost"); String jdgServer = config.get("remoteStoreHost", "127.0.0.1");
Integer jdgPort = config.getInt("remoteStorePort", 11222); Integer jdgPort = config.getInt("remoteStorePort", 11222);
// After upgrade to Infinispan 12.1.7.Final it's required that both remote store and embedded cache use // After upgrade to Infinispan 12.1.7.Final it's required that both remote store and embedded cache use

7
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/ClientListenerExecutorDecorator.java
View file

@ -127,10 +127,17 @@ public class ClientListenerExecutorDecorator<K> {
} catch (RejectedExecutionException ree) { } catch (RejectedExecutionException ree) {
eventsInProgress.remove(key); eventsInProgress.remove(key);
// server is shutting down or pool was terminated - don't throw errors
if (ree.getMessage() != null && (ree.getMessage().contains("Terminated") || ree.getMessage().contains("Shutting down"))) {
logger.warnf("Rejected execution of task for the event '%s' because server is shutting down or pool was terminated.", event.toString());
logger.debug(ree);
} else {
// avoid touching the cache when creating a log message to avoid a deadlock in Infinispan 12.1.7.Final
logger.errorf("Rejected execution of task for the event '%s' . Try to increase the pool size. Pool is '%s'", event.toString(), decorated.toString()); logger.errorf("Rejected execution of task for the event '%s' . Try to increase the pool size. Pool is '%s'", event.toString(), decorated.toString());
throw ree; throw ree;
} }
} }
}
// Assume it's called from the synchronized block // Assume it's called from the synchronized block

4
pom.xml
View file

@ -81,8 +81,8 @@
<jakarta.persistence.version>2.2.3</jakarta.persistence.version> <jakarta.persistence.version>2.2.3</jakarta.persistence.version>
<hibernate-orm.version>5.6.14.Final</hibernate-orm.version> <hibernate-orm.version>5.6.14.Final</hibernate-orm.version>
<hibernate.c3p0.version>${hibernate-orm.version}</hibernate.c3p0.version> <hibernate.c3p0.version>${hibernate-orm.version}</hibernate.c3p0.version>
<infinispan.version>14.0.2.Final</infinispan.version> <infinispan.version>14.0.4.Final</infinispan.version>
<infinispan.protostream.processor.version>4.5.0.Final</infinispan.protostream.processor.version> <infinispan.protostream.processor.version>4.6.0.Final</infinispan.protostream.processor.version>
<jackson.version>2.13.4</jackson.version> <jackson.version>2.13.4</jackson.version>
<jackson.databind.version>2.13.4.2</jackson.databind.version> <jackson.databind.version>2.13.4.2</jackson.databind.version>
<jackson.annotations.version>${jackson.version}</jackson.annotations.version> <jackson.annotations.version>${jackson.version}</jackson.annotations.version>