apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated upgrade paths (#3972)

Browse Source 
* Updated upgrade paths

* Added license info

Co-authored-by: dahn <daan.hoogland@shapeblue.com>
This commit is contained in:
Spaceman1984 2020-03-24 16:04:42 +02:00 committed by GitHub
parent 173174c804
commit 84bede2171
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ import com.cloud.upgrade.dao.Upgrade41120to41130;
import com.cloud.upgrade.dao.Upgrade41120to41200;
import com.cloud.upgrade.dao.Upgrade41200to41300;
import com.cloud.upgrade.dao.Upgrade41300to41310;
import com.cloud.upgrade.dao.Upgrade41300to41400;
import com.cloud.upgrade.dao.Upgrade41310to41400;
import com.cloud.upgrade.dao.Upgrade420to421;
import com.cloud.upgrade.dao.Upgrade421to430;
import com.cloud.upgrade.dao.Upgrade430to440;
@ -189,12 +189,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
.next("4.11.2.0", new Upgrade41120to41130())
.next("4.11.3.0", new Upgrade41120to41200())
.next("4.12.0.0", new Upgrade41200to41300())
<<<<<<< HEAD
.next("4.13.0.0", new Upgrade41300to41400())
.next("4.13.1.0", new Upgrade41300to41400())
=======
.next("4.13.0.0", new Upgrade41300to41310())
>>>>>>> 4.13
.next("4.13.1.0", new Upgrade41310to41400())
.build();
}

10
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java → engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java
View File

@ -32,13 +32,13 @@ import org.apache.log4j.Logger;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.exception.CloudRuntimeException;
public class Upgrade41300to41400 implements DbUpgrade {
public class Upgrade41310to41400 implements DbUpgrade {
final static Logger LOG = Logger.getLogger(Upgrade41300to41400.class);
final static Logger LOG = Logger.getLogger(Upgrade41310to41400.class);
@Override
public String[] getUpgradableVersionRange() {
return new String[] {"4.13.0.0", "4.14.0.0"};
return new String[] {"4.13.1.0", "4.14.0.0"};
}
@Override
@ -53,7 +53,7 @@ public class Upgrade41300to41400 implements DbUpgrade {
@Override
public InputStream[] getPrepareScripts() {
final String scriptFile = "META-INF/db/schema-41300to41400.sql";
final String scriptFile = "META-INF/db/schema-41310to41400.sql";
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
if (script == null) {
throw new CloudRuntimeException("Unable to find " + scriptFile);
@ -237,7 +237,7 @@ public class Upgrade41300to41400 implements DbUpgrade {
@Override
public InputStream[] getCleanupScripts() {
final String scriptFile = "META-INF/db/schema-41300to41400-cleanup.sql";
final String scriptFile = "META-INF/db/schema-41310to41400-cleanup.sql";
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
if (script == null) {
throw new CloudRuntimeException("Unable to find " + scriptFile);

2
engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql → engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql
View File

@ -16,7 +16,7 @@
-- under the License.
--;
-- Schema upgrade cleanup from 4.13.0.0 to 4.14.0.0
-- Schema upgrade cleanup from 4.13.1.0 to 4.14.0.0
--;
DELETE FROM `cloud`.`configuration` WHERE name = 'host.maintenance.retries';

2
engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql → engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
View File

@ -16,7 +16,7 @@
-- under the License.
--;
-- Schema upgrade from 4.13.0.0 to 4.14.0.0
-- Schema upgrade from 4.13.1.0 to 4.14.0.0
--;
-- KVM: enable storage data motion on KVM hypervisor_capabilities