Skip to content

Fix stateless cluster and db migrations race #51357

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
ahus1 merged 1 commit into from
Aug 2, 2026
Merged

Fix stateless cluster and db migrations race #51357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions ...an/src/main/java/org/keycloak/cluster/infinispan/DatabaseAwareClusterProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ public class DatabaseAwareClusterProviderFactory extends InfinispanClusterProvid

private static final String DEFAULT_POLL_INTERVAL_MS = "100ms";

private volatile NodeInfo nodeInfo;
private volatile Marshaller protoStreamMarshaller;
private Timer timer;

private Duration pollInterval;
Expand All @@ -66,8 +64,10 @@ public DatabaseAwareClusterProviderFactory() {

@Override
public ClusterProvider create(KeycloakSession session) {
return new DatabaseAwareClusterProvider(super.create(session), session,
nodeInfo, protoStreamMarshaller, awaitTimeout);
ClusterProvider delegate = super.create(session);
InfinispanConnectionProvider ispnConnections = session.getProvider(InfinispanConnectionProvider.class);
return new DatabaseAwareClusterProvider(delegate, session,
ispnConnections.getNodeInfo(), ispnConnections.getMarshaller(), awaitTimeout);
}

@Override
Expand Down Expand Up @@ -100,8 +100,8 @@ public List<ProviderConfigProperty> getConfigMetadata() {
public void postInit(KeycloakSessionFactory factory) {
KeycloakModelUtils.runJobInTransaction(factory, session -> {
InfinispanConnectionProvider ispnConnections = session.getProvider(InfinispanConnectionProvider.class);
nodeInfo = ispnConnections.getNodeInfo();
this.protoStreamMarshaller = ispnConnections.getMarshaller();
NodeInfo nodeInfo = ispnConnections.getNodeInfo();
Marshaller protoStreamMarshaller = ispnConnections.getMarshaller();

var pollerTask = new DatabaseClusterEventPollerTask(nodeInfo.clusterName(), protoStreamMarshaller);
var runner = new ScheduledTaskRunner(factory, pollerTask);
Expand Down
60 changes: 60 additions & 0 deletions .../base/src/test/java/org/keycloak/tests/model/DatabaseAwareClusterProviderFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Copyright 2026 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.keycloak.tests.model;

import org.keycloak.Config;
import org.keycloak.cluster.infinispan.DatabaseAwareClusterProviderFactory;
import org.keycloak.common.Profile;
import org.keycloak.models.cache.infinispan.ClearCacheEvent;
import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
import org.keycloak.testframework.remote.runonserver.InjectRunOnServer;
import org.keycloak.testframework.remote.runonserver.RunOnServerClient;
import org.keycloak.testframework.server.KeycloakServerConfig;
import org.keycloak.testframework.server.KeycloakServerConfigBuilder;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

@KeycloakIntegrationTest(config = DatabaseAwareClusterProviderFactoryTest.ServerConfig.class)
public class DatabaseAwareClusterProviderFactoryTest {

@InjectRunOnServer(permittedPackages = "org.keycloak.tests")
RunOnServerClient runOnServer;

@Test
public void providerCreatedBeforePostInitCanSendClusterEvent() {
assertDoesNotThrow(() -> runOnServer.run(session -> {
var factory = new DatabaseAwareClusterProviderFactory();
factory.init(Config.scope("cluster", factory.getId()));
try {
factory.create(session).notify("test", ClearCacheEvent.getInstance(), true);
} finally {
factory.close();
}
}));
}

public static class ServerConfig implements KeycloakServerConfig {

@Override
public KeycloakServerConfigBuilder configure(KeycloakServerConfigBuilder config) {
return config.features(Profile.Feature.STATELESS);
}
}
}
Loading