Skip to content

Avoid concurrent shutdown of Infinispan caches to avoid lockup. #10288

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

Merged
hmlnarik merged 2 commits into from
Mar 4, 2022
Merged

Avoid concurrent shutdown of Infinispan caches to avoid lockup. #10288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d7c20a
Workaround for deadlock when shutting down Infinispan in 12.1.7.Final.
ahus1 Feb 17, 2022
8badea0
Ensure that Infinispan shutdowns correctly at the end of the tests. R…
ahus1 Feb 17, 2022
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
26 changes: 15 additions & 11 deletions ...ispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,28 +201,32 @@ public void viewChanged(ViewChangedEvent event) {

// Use separate thread to avoid potential deadlock
localExecutor.execute(() -> {
EmbeddedCacheManager cacheManager = workCache.getCacheManager();
Transport transport = cacheManager.getTransport();
try {
EmbeddedCacheManager cacheManager = workCache.getCacheManager();
Transport transport = cacheManager.getTransport();

// Coordinator makes sure that entries for outdated nodes are cleaned up
if (transport != null && transport.isCoordinator()) {
// Coordinator makes sure that entries for outdated nodes are cleaned up
if (transport != null && transport.isCoordinator()) {

removedNodesAddresses.removeAll(newAddresses);
removedNodesAddresses.removeAll(newAddresses);

if (removedNodesAddresses.isEmpty()) {
return;
}
if (removedNodesAddresses.isEmpty()) {
return;
}

logger.debugf("Nodes %s removed from cluster. Removing tasks locked by this nodes", removedNodesAddresses.toString());
logger.debugf("Nodes %s removed from cluster. Removing tasks locked by this nodes", removedNodesAddresses.toString());
/*
workaround for Infinispan 12.1.7.Final to prevent a deadlock while
DefaultInfinispanConnectionProviderFactory is shutting down PersistenceManagerImpl
that acquires a writeLock and this removal that acquires a readLock.
https://issues.redhat.com/browse/ISPN-13664
*/
synchronized (DefaultInfinispanConnectionProviderFactory.class) {
workCache.entrySet().removeIf(new LockEntryPredicate(removedNodesAddresses));
synchronized (DefaultInfinispanConnectionProviderFactory.class) {
workCache.entrySet().removeIf(new LockEntryPredicate(removedNodesAddresses));
}
}
} catch (Throwable t) {
logger.error("caught exception in ViewChangeListener", t);
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion ...inispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanNotificationsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ private void hotrodEventReceived(String key) {

});
} catch (RejectedExecutionException ree) {
logger.errorf("Rejected submitting of the event for key: %s. Value: %s, Server going to shutdown or pool exhausted. Pool: %s", key, workCache.get(key), listenersExecutor.toString());
// 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());
throw ree;
}
}
Expand Down
7 changes: 7 additions & 0 deletions testsuite/model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-core</artifactId>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-component-annotations</artifactId>
<version>${infinispan.version}</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -146,6 +151,8 @@
<log4j.configuration>file:${project.build.directory}/test-classes/log4j.properties</log4j.configuration> <!-- for the logging to properly work with tests in the 'other' module -->
<keycloak.profile.feature.map_storage>${keycloak.profile.feature.map_storage}</keycloak.profile.feature.map_storage>
<keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase>${keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase}</keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<org.jboss.logging.provider>log4j</org.jboss.logging.provider>
</systemPropertyVariables>
</configuration>
</plugin>
Expand Down
Loading