You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2020/03/24 14:04:57 UTC
[cloudstack] branch master updated: Updated upgrade paths (#3972)
This is an automated email from the ASF dual-hosted git repository.
andrijapanic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 84bede2 Updated upgrade paths (#3972)
84bede2 is described below
commit 84bede217165a3135281bdf2c37d41809441348f
Author: Spaceman1984 <49...@users.noreply.github.com>
AuthorDate: Tue Mar 24 16:04:42 2020 +0200
Updated upgrade paths (#3972)
* Updated upgrade paths
* Added license info
Co-authored-by: dahn <da...@shapeblue.com>
---
.../main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java | 8 ++------
.../dao/{Upgrade41300to41400.java => Upgrade41310to41400.java} | 10 +++++-----
...1300to41400-cleanup.sql => schema-41310to41400-cleanup.sql} | 2 +-
.../db/{schema-41300to41400.sql => schema-41310to41400.sql} | 2 +-
4 files changed, 9 insertions(+), 13 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 671f0ed..eed2e2f 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -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();
}
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java
similarity index 97%
rename from engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java
rename to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java
index fc0ce74..0ce6809 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java
@@ -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);
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql
similarity index 95%
rename from engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql
rename to engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql
index 7758f11..3199e8b 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql
@@ -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';
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
similarity index 99%
rename from engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql
rename to engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
index 2c9c7ab..bc00941 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
@@ -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