Skip to content

Delay user storage cluster sync event to after completion #48697

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

Open
pedroigor wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −3
Open

Delay user storage cluster sync event to after completion #48697

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
24 changes: 21 additions & 3 deletions model/storage-private/src/main/java/org/keycloak/storage/UserStorageEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.keycloak.cluster.ClusterEvent;
import org.keycloak.cluster.ClusterListener;
import org.keycloak.cluster.ClusterProvider;
import org.keycloak.models.AbstractKeycloakTransaction;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
Expand Down Expand Up @@ -128,10 +129,13 @@ private void notifyStoreSyncClusterUpdate(KeycloakSession session, RealmModel re

ClusterProvider cp = session.getProvider(ClusterProvider.class);

if (cp != null) {
UserStorageProviderClusterEvent event = UserStorageProviderClusterEvent.createEvent(removed, realm.getId(), provider);
cp.notify(USER_STORAGE_TASK_KEY, event, true);
if (cp == null) {
return;
}

UserStorageProviderClusterEvent event = UserStorageProviderClusterEvent.createEvent(removed, realm.getId(), provider);

session.getTransactionManager().enlistAfterCompletion(createClusterSyncEventTransaction(cp, event));
}

private void refreshScheduledTasks(KeycloakSession session, UserStorageProviderModel model, boolean removed) {
Expand All @@ -150,4 +154,18 @@ private Stream<UserStorageProviderModel> getUserStorageProvidersStream(RealmMode

return Stream.empty();
}

private AbstractKeycloakTransaction createClusterSyncEventTransaction(ClusterProvider cp, UserStorageProviderClusterEvent event) {
return new AbstractKeycloakTransaction() {
@Override
protected void commitImpl() {
cp.notify(USER_STORAGE_TASK_KEY, event, true);
}

@Override
protected void rollbackImpl() {

}
};
}
}
Loading