데이터베이스 업그레이드 체크시 버그 수정/ 빌드 오류 소스 정리작업

Author: jschoiRR

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -1311,6 +1311,7 @@ public class ApiConstants {
     public static final String CURRENT_VM_ID = "currentvmid";
 
     public static final String RESULT_REDFISH_DATA = "redfishdata";
+    public static final String EXTERNAL_ENTITY = "externalEntity";
 
     /**
      * This enum specifies IO Drivers, each option controls specific policies on I/O.

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

@@ -453,7 +453,7 @@ public void check() {
 
                 // DB version 테이블의 latest 행 삭제
                 final CloudStackVersion dbVersionInitial = CloudStackVersion.parse(_dao.getCurrentVersion());
-                deleteCurrentVersionRowIfPresent(dbVersionInitial);
+                enforceBaselineThenDeleteLastVersionIfNeeded(dbVersionInitial);
 
                 final String currentVersionValue = this.getClass().getPackage().getImplementationVersion();
                 if (StringUtils.isBlank(currentVersionValue)) return;
@@ -495,6 +495,72 @@ public void check() {
         }
     }
 
+    private void enforceBaselineThenDeleteLastVersionIfNeeded(final CloudStackVersion dbVersionInitial) {
+        final String BASELINE_VERSION = "4.0.0";
+        final String targetVersion = dbVersionInitial != null ? dbVersionInitial.toString() : null;
+
+        final TransactionLegacy txn = TransactionLegacy.open("enforce-baseline-then-delete-last");
+        txn.start();
+        try {
+            final Connection conn = txn.getConnection();
+
+            // 1) '4.0.0' 없으면 즉시 삽입(있으면 0 rows) → 한 턴에 끝
+            final String insertIfMissingSql =
+                "INSERT INTO `cloud`.`version` (`version`, `step`, `updated`) " +
+                "SELECT ?, 'Complete', NOW() FROM DUAL " +
+                "WHERE NOT EXISTS (SELECT 1 FROM `cloud`.`version` WHERE `version` = ?)";
+
+            try (PreparedStatement ins = conn.prepareStatement(insertIfMissingSql)) {
+                ins.setString(1, BASELINE_VERSION);
+                ins.setString(2, BASELINE_VERSION);
+                int inserted = ins.executeUpdate();
+                if (inserted > 0) {
+                    LOGGER.info("Inserted baseline version row: {}", BASELINE_VERSION);
+                    txn.commit();
+                    return; // 여기서 바로 종료
+                }
+            }
+
+            // 2) 삭제 대상: dbVersionInitial 의 최신 1건 (단, 베이스라인이면 삭제 금지)
+            if (targetVersion != null && !BASELINE_VERSION.equals(targetVersion)) {
+                // 최신 1건을 서브쿼리로 바로 삭제 (MySQL은 DELETE에서 서브쿼리 테이블 참조 시 래핑 필요)
+                final String deleteLatestOneSql =
+                    "DELETE FROM `cloud`.`version` " +
+                    "WHERE `id` IN ( " +
+                    "  SELECT id FROM ( " +
+                    "    SELECT `id` " +
+                    "    FROM `cloud`.`version` " +
+                    "    WHERE `version` = ? AND (`step` IS NULL OR `step` = 'Complete') " +
+                    "    ORDER BY COALESCE(`updated`, FROM_UNIXTIME(0)) DESC " +
+                    "    LIMIT 1 " +
+                    "  ) AS _x " +
+                    ")";
+
+                try (PreparedStatement delLatest = conn.prepareStatement(deleteLatestOneSql)) {
+                    delLatest.setString(1, targetVersion);
+                    int deleted = delLatest.executeUpdate();
+                    if (deleted > 0) {
+                        LOGGER.warn("Deleted {} latest row for version {}", deleted, targetVersion);
+                        txn.commit();
+                        return; // 목적(해당 버전 최신 1건 삭제) 달성 시 즉시 종료
+                    } else {
+                        LOGGER.info("No deletable row found for targetVersion={}; skipping targeted delete.", targetVersion);
+                    }
+                }
+            } else {
+                LOGGER.info("Target version is baseline or null ({}). Skipping targeted delete.", targetVersion);
+            }
+
+            txn.commit();
+        } catch (SQLException e) {
+            txn.rollback();
+            LOGGER.error("Failed in enforceBaselineThenDeleteLastVersionIfNeeded", e);
+            throw new CloudRuntimeException("Failed in enforceBaselineThenDeleteLastVersionIfNeeded", e);
+        } finally {
+            txn.close();
+        }
+    }
+
     // Cloudstack DB 업데이트 전 Ablestack DB 업데이트 진행
     public void beforeUpgradeAblestack (String ablestackVersion) {
         TransactionLegacy txn = TransactionLegacy.open("Upgrade");
@@ -530,27 +596,6 @@ public void beforeUpgradeAblestack (String ablestackVersion) {
         }
     }
 
-    private void deleteCurrentVersionRowIfPresent(final CloudStackVersion currentVersion) {
-        TransactionLegacy txn = TransactionLegacy.open("delete-current-version-row");
-        txn.start();
-        try {
-            Connection conn = txn.getConnection();
-            try (PreparedStatement ps = conn.prepareStatement(
-                    "DELETE FROM `cloud`.`version` WHERE `version` = ? AND (`step` IS NULL OR `step` = 'Complete')")) {
-                ps.setString(1, currentVersion.toString());
-                int deleted = ps.executeUpdate();
-                LOGGER.warn("Deleted {} row(s) from cloud.version for {}", deleted, currentVersion);
-            }
-            txn.commit();
-        } catch (SQLException e) {
-            txn.rollback();
-            LOGGER.error("Unable to delete current version row", e);
-            throw new CloudRuntimeException("Unable to delete current version row", e);
-        } finally {
-            txn.close();
-        }
-    }
-
     // Cloudstack DB 업데이트 후 Ablestack DB 업데이트 진행
     public void afterUpgradeAblestack (String ablestackVersion) {
         TransactionLegacy txn = TransactionLegacy.open("Upgrade");

plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java

@@ -30,7 +30,6 @@
 import org.apache.cloudstack.saml.SAML2AuthManager;
 import org.apache.cloudstack.saml.SAMLPluginConstants;
 import org.apache.cloudstack.saml.SAMLProviderMetadata;
-import org.apache.cloudstack.saml.SAMLProviderMetadata;
 import org.apache.cloudstack.saml.SAMLUtils;
 import org.opensaml.DefaultBootstrap;
 import org.opensaml.saml2.core.LogoutRequest;

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -10022,7 +10022,7 @@ public UserVm createCloneVM(CloneVMCmd cmd, Long rootVolumeId) throws Concurrent
                         null, new HashMap<>(), null, new HashMap<>(), dynamicScalingEnabled, null, null);
             }
         } catch (CloudRuntimeException e) {
-            _templateMgr.delete(curAccount.getId(), template.getId(), zoneId);
+            // _templateMgr.delete(curAccount.getId(), template.getId(), zoneId);
             throw new CloudRuntimeException("Unable to create the clone VM record");
         }
         return vmResult;