From eba3b1d253234411679633ebe23b1ca62deedc57 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 26 May 2023 16:36:30 +0200 Subject: [PATCH] make NoopDbUpgrade do a systemvm template check --- .../cloud/upgrade/DatabaseUpgradeChecker.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java index 932dc71f4b0d..73757864e5e3 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -444,10 +444,11 @@ private void decryptInit(Connection conn) throws SQLException { } @VisibleForTesting - protected static final class NoopDbUpgrade implements DbUpgrade { + protected static final class NoopDbUpgrade implements DbUpgrade, DbUpgradeSystemVmTemplate { private final String upgradedVersion; private final String[] upgradeRange; + private SystemVmTemplateRegistration systemVmTemplateRegistration; private NoopDbUpgrade(final CloudStackVersion fromVersion, final CloudStackVersion toVersion) { @@ -488,5 +489,19 @@ public InputStream[] getCleanupScripts() { return new InputStream[0]; } + private void initSystemVmTemplateRegistration() { + systemVmTemplateRegistration = new SystemVmTemplateRegistration(""); + } + + @Override + public void updateSystemVmTemplates(Connection conn) { + s_logger.debug("Updating System Vm template IDs"); + initSystemVmTemplateRegistration(); + try { + systemVmTemplateRegistration.updateSystemVmTemplates(conn); + } catch (Exception e) { + throw new CloudRuntimeException("Failed to find / register SystemVM template(s)"); + } + } } }