This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 9b3c318db6a upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (#8893)
9b3c318db6a is described below
commit 9b3c318db6a78ee9e75b03775793323dee234684
Author: Wei Zhou <[email protected]>
AuthorDate: Mon Jun 3 08:12:28 2024 +0200
upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (#8893)
This PR move upgrade files for 4.19.0->4.20.0 to 4.19.1->4.20.0
---
.../src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java | 6 ++++--
.../dao/{Upgrade41900to42000.java => Upgrade41910to42000.java} | 8 ++++----
...a-41900to42000-cleanup.sql => schema-41910to42000-cleanup.sql} | 0
.../db/{schema-41900to42000.sql => schema-41910to42000.sql} | 0
4 files changed, 8 insertions(+), 6 deletions(-)
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 ea8ce47611a..d390a480e41 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -33,7 +33,6 @@ import java.util.List;
import javax.inject.Inject;
-import com.cloud.upgrade.dao.Upgrade41900to42000;
import com.cloud.utils.FileUtil;
import org.apache.cloudstack.utils.CloudStackVersion;
import org.apache.commons.lang3.StringUtils;
@@ -87,6 +86,8 @@ import com.cloud.upgrade.dao.Upgrade41710to41720;
import com.cloud.upgrade.dao.Upgrade41720to41800;
import com.cloud.upgrade.dao.Upgrade41800to41810;
import com.cloud.upgrade.dao.Upgrade41810to41900;
+import com.cloud.upgrade.dao.Upgrade41900to41910;
+import com.cloud.upgrade.dao.Upgrade41910to42000;
import com.cloud.upgrade.dao.Upgrade420to421;
import com.cloud.upgrade.dao.Upgrade421to430;
import com.cloud.upgrade.dao.Upgrade430to440;
@@ -226,7 +227,8 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
.next("4.17.2.0", new Upgrade41720to41800())
.next("4.18.0.0", new Upgrade41800to41810())
.next("4.18.1.0", new Upgrade41810to41900())
- .next("4.19.0.0", new Upgrade41900to42000())
+ .next("4.19.0.0", new Upgrade41900to41910())
+ .next("4.19.1.0", new Upgrade41910to42000())
.build();
}
diff --git
a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to42000.java
b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to42000.java
similarity index 91%
rename from
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to42000.java
rename to
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to42000.java
index 200c5fda232..d8c7684f8e3 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to42000.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to42000.java
@@ -22,12 +22,12 @@ import java.sql.Connection;
import com.cloud.upgrade.SystemVmTemplateRegistration;
import com.cloud.utils.exception.CloudRuntimeException;
-public class Upgrade41900to42000 extends DbUpgradeAbstractImpl implements
DbUpgrade, DbUpgradeSystemVmTemplate {
+public class Upgrade41910to42000 extends DbUpgradeAbstractImpl implements
DbUpgrade, DbUpgradeSystemVmTemplate {
private SystemVmTemplateRegistration systemVmTemplateRegistration;
@Override
public String[] getUpgradableVersionRange() {
- return new String[] {"4.19.0.0", "4.20.0.0"};
+ return new String[] {"4.19.1.0", "4.20.0.0"};
}
@Override
@@ -42,7 +42,7 @@ public class Upgrade41900to42000 extends
DbUpgradeAbstractImpl implements DbUpgr
@Override
public InputStream[] getPrepareScripts() {
- final String scriptFile = "META-INF/db/schema-41900to42000.sql";
+ final String scriptFile = "META-INF/db/schema-41910to42000.sql";
final InputStream script =
Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
if (script == null) {
throw new CloudRuntimeException("Unable to find " + scriptFile);
@@ -57,7 +57,7 @@ public class Upgrade41900to42000 extends
DbUpgradeAbstractImpl implements DbUpgr
@Override
public InputStream[] getCleanupScripts() {
- final String scriptFile =
"META-INF/db/schema-41900to42000-cleanup.sql";
+ final String scriptFile =
"META-INF/db/schema-41910to42000-cleanup.sql";
final InputStream script =
Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
if (script == null) {
throw new CloudRuntimeException("Unable to find " + scriptFile);
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-41900to42000-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000-cleanup.sql
similarity index 100%
rename from
engine/schema/src/main/resources/META-INF/db/schema-41900to42000-cleanup.sql
rename to
engine/schema/src/main/resources/META-INF/db/schema-41910to42000-cleanup.sql
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql
b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
similarity index 100%
rename from engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql
rename to engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
