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

Assure that a second thread waits for the first thread to process the database changes

Browse source 
Closes #13130
This commit is contained in:
Alexander Schwartz 2022-07-16 12:30:34 +02:00 committed by Hynek Mlnařík
parent 3f5a087db9
commit 247cf0d09a
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java
View file

@ -166,6 +166,10 @@ public class JpaMapStorageProviderFactory implements
private final String sessionProviderKey;
private final String sessionTxKey;
// Object instances for each single JpaMapStorageProviderFactory instance per model type.
// Used to synchronize on when validating the model type area.
private final ConcurrentHashMap<Class<?>, Object> SYNC_MODELS = new ConcurrentHashMap<>();
public final static DeepCloner CLONER = new DeepCloner.Builder()
//auth-sessions
.constructor(JpaRootAuthenticationSessionEntity.class, JpaRootAuthenticationSessionEntity::new)
@ -374,24 +378,29 @@ public class JpaMapStorageProviderFactory implements
if (this.validatedModelNames.add(modelName)) {
*/
if (this.validatedModels.add(modelType)) {
Connection connection = getConnection();
try {
if (logger.isDebugEnabled()) printOperationalInfo(connection);
MapJpaUpdaterProvider updater = session.getProvider(MapJpaUpdaterProvider.class);
MapJpaUpdaterProvider.Status status = updater.validate(modelType, connection, config.get("schema"));
if (!status.equals(VALID)) {
update(modelType, connection, session);
}
} finally {
if (connection != null) {
if (!this.validatedModels.contains(modelType)) {
synchronized (SYNC_MODELS.computeIfAbsent(modelType, mc -> new Object())) {
if (!this.validatedModels.contains(modelType)) {
Connection connection = getConnection();
try {
connection.close();
} catch (SQLException e) {
logger.warn("Can't close connection", e);
if (logger.isDebugEnabled()) printOperationalInfo(connection);
MapJpaUpdaterProvider updater = session.getProvider(MapJpaUpdaterProvider.class);
MapJpaUpdaterProvider.Status status = updater.validate(modelType, connection, config.get("schema"));
if (!status.equals(VALID)) {
update(modelType, connection, session);
}
} finally {
if (connection != null) {
try {
connection.close();
} catch (SQLException e) {
logger.warn("Can't close connection", e);
}
}
}
validatedModels.add(modelType);
}
}
}