FINERACT-2181: Liquibase migrations are stuck when multi-threaded mig…

…rations are enabled and one tenant migration fails
apache · Mar 6, 2025 · 868ba54 · 868ba54
1 parent f8e5d6c
commit 868ba54
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...g/apache/fineract/infrastructure/core/service/migration/TenantDatabaseUpgradeService.java b/...g/apache/fineract/infrastructure/core/service/migration/TenantDatabaseUpgradeService.java
@@ -148,16 +148,23 @@ private void upgradeIndividualTenants() {
             }
         }
 
+        List<Exception> exceptions = new ArrayList<>();
         try {
             for (Future<String> future : futures) {
                 future.get();
             }
         } catch (InterruptedException | ExecutionException exception) {
-            throw new RuntimeException(exception);
+            exceptions.add(exception);
         } finally {
             tenantUpgradeThreadPoolTaskExecutor.shutdown();
         }
-        log.info("Tenant upgrades have finished");
+
+        if (exceptions.isEmpty()) {
+            log.info("Tenant upgrades have successfully finished");
+        } else {
+            exceptions.forEach(e -> log.error("Exception: ", e));
+            throw new RuntimeException("Tenant upgrades had exceptions");
+        }
     }
 
     private ThreadPoolTaskExecutor createTenantUpgradeThreadPoolTaskExecutor() {
@@ -193,6 +200,8 @@ private void upgradeIndividualTenant(FineractPlatformTenant tenant) throws Liqui
                     tenant.getTenantIdentifier());
             tenantLiquibase.afterPropertiesSet();
             log.info("Upgrade for tenant {} has finished", tenant.getTenantIdentifier());
+        } catch (Exception e) {
+            throw new RuntimeException("Exception while upgrading tenant " + tenant.getTenantIdentifier(), e);
         }
     }
 

diff --git a/...vider/src/test/java/org/apache/fineract/infrastructure/core/LiquibaseStepDefinitions.java b/...vider/src/test/java/org/apache/fineract/infrastructure/core/LiquibaseStepDefinitions.java
@@ -40,7 +40,6 @@
 import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
 import org.apache.fineract.infrastructure.core.service.migration.ExtendedSpringLiquibase;
 import org.apache.fineract.infrastructure.core.service.migration.ExtendedSpringLiquibaseFactory;
-import org.apache.fineract.infrastructure.core.service.migration.SchemaUpgradeNeededException;
 import org.apache.fineract.infrastructure.core.service.migration.TenantDataSourceFactory;
 import org.apache.fineract.infrastructure.core.service.migration.TenantDatabaseStateVerifier;
 import org.apache.fineract.infrastructure.core.service.migration.TenantDatabaseUpgradeService;
@@ -66,7 +65,7 @@ public class LiquibaseStepDefinitions implements En {
     private DataSource tenantStoreDataSource;
     private TenantDatabaseUpgradeService tenantDatabaseUpgradeService;
     private List<FineractPlatformTenant> allTenants;
-    private SchemaUpgradeNeededException executionException;
+    private RuntimeException executionException;
     private HikariDataSource defaultTenantDataSource;
     private Environment environment;
 
@@ -103,10 +102,8 @@ public LiquibaseStepDefinitions() {
         When("The database migration process is executed", () -> {
             try {
                 tenantDatabaseUpgradeService.afterPropertiesSet();
-            } catch (SchemaUpgradeNeededException e) {
-                executionException = e;
             } catch (RuntimeException e) {
-                executionException = (SchemaUpgradeNeededException) e.getCause().getCause();
+                executionException = e;
             }
         });