etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Wei Zhou 2024-06-03 08:12:28 +02:00 committed by GitHub
parent 5433e775e5
commit 9b3c318db6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
View File

@ -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();
}

8
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to42000.java → engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to42000.java
View File

@ -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);

0
engine/schema/src/main/resources/META-INF/db/schema-41900to42000-cleanup.sql → engine/schema/src/main/resources/META-INF/db/schema-41910to42000-cleanup.sql
View File

0
engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql → engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
View File