Adding retries to avoid group not being loaded in parallel mode

adorsys · Dec 7, 2023 · 6373689 · 6373689
1 parent 1a87c32
commit 6373689
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/src/main/java/de/adorsys/keycloak/config/service/GroupImportService.java b/src/main/java/de/adorsys/keycloak/config/service/GroupImportService.java
@@ -20,6 +20,7 @@
 
 package de.adorsys.keycloak.config.service;
 
+import de.adorsys.keycloak.config.exception.ImportProcessingException;
 import de.adorsys.keycloak.config.model.RealmImport;
 import de.adorsys.keycloak.config.properties.ImportConfigProperties;
 import de.adorsys.keycloak.config.properties.ImportConfigProperties.ImportManagedProperties.ImportManagedPropertiesValues;
@@ -32,12 +33,14 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @Service
 public class GroupImportService {
     private static final Logger logger = LoggerFactory.getLogger(GroupImportService.class);
+    private static final int LOAD_CREATED_GROUP_MAX_RETRIES = 5;
 
     private final GroupRepository groupRepository;
     private final ImportConfigProperties importConfigProperties;
@@ -134,14 +137,34 @@ private void createOrUpdateRealmGroup(String realmName, GroupRepresentation grou
     private void createGroup(String realmName, GroupRepresentation group) {
         groupRepository.createGroup(realmName, group);
 
-        GroupRepresentation existingGroup = groupRepository.getGroupByName(realmName, group.getName());
+        GroupRepresentation existingGroup = loadCreatedGroupUsingRamp(realmName, group.getName(), 0);
         GroupRepresentation patchedGroup = CloneUtil.patch(existingGroup, group);
 
         addRealmRoles(realmName, patchedGroup);
         addClientRoles(realmName, patchedGroup);
         addSubGroups(realmName, patchedGroup);
     }
 
+    private GroupRepresentation loadCreatedGroupUsingRamp(String realmName, String groupName, int retryCount) {
+        if (retryCount >= LOAD_CREATED_GROUP_MAX_RETRIES) {
+            throw new ImportProcessingException("Cannot find created group '%s' in realm '%s'", groupName, realmName);
+        }
+
+        GroupRepresentation existingGroup = groupRepository.getGroupByName(realmName, groupName);
+
+        if (existingGroup != null) {
+            return existingGroup;
+        }
+
+        try {
+            TimeUnit.MILLISECONDS.sleep(250L * retryCount * retryCount);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        return loadCreatedGroupUsingRamp(realmName, groupName, retryCount + 1);
+    }
+
     private void addRealmRoles(String realmName, GroupRepresentation existingGroup) {
         List<String> realmRoles = existingGroup.getRealmRoles();