You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/09/12 10:32:54 UTC
[cloudstack] branch master updated (c49807f -> e559154)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from c49807f Merge remote-tracking branch 'origin/4.11'
add 5a046e2 systemvmtemplate: new 4.11.2 template and fixes (#2799)
new e559154 Merge remote-tracking branch 'origin/4.11'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade41100to41110.java | 183 +--------------------
...e41100to41110.java => Upgrade41110to41120.java} | 172 ++++++-------------
...e41110to41200.java => Upgrade41120to41200.java} | 8 +-
...41to442.sql => schema-41110to41120-cleanup.sql} | 3 +-
...10to420-cleanup.sql => schema-41110to41120.sql} | 12 +-
...cleanup.sql => schema-41120to41200-cleanup.sql} | 2 +-
...ma-41110to41200.sql => schema-41120to41200.sql} | 2 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 11 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 17 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 16 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 39 ++---
systemvm/debian/opt/cloud/bin/setup/router.sh | 63 ++++---
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 1 +
.../systemvmtemplate/scripts/apt_upgrade.sh | 4 +-
15 files changed, 133 insertions(+), 412 deletions(-)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41100to41110.java => Upgrade41110to41120.java} (68%)
rename engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41110to41200.java => Upgrade41120to41200.java} (89%)
copy engine/schema/src/main/resources/META-INF/db/{schema-441to442.sql => schema-41110to41120-cleanup.sql} (94%)
copy engine/schema/src/main/resources/META-INF/db/{schema-410to420-cleanup.sql => schema-41110to41120.sql} (57%)
rename engine/schema/src/main/resources/META-INF/db/{schema-41110to41200-cleanup.sql => schema-41120to41200-cleanup.sql} (95%)
rename engine/schema/src/main/resources/META-INF/db/{schema-41110to41200.sql => schema-41120to41200.sql} (97%)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.11'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e559154a416992847aef8b9683706eb26e978aad
Merge: c49807f 5a046e2
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Sep 12 15:20:10 2018 +0530
Merge remote-tracking branch 'origin/4.11'
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade41100to41110.java | 183 +--------------------
...e41100to41110.java => Upgrade41110to41120.java} | 172 ++++++-------------
...e41110to41200.java => Upgrade41120to41200.java} | 8 +-
...cleanup.sql => schema-41110to41120-cleanup.sql} | 9 +-
...to41200-cleanup.sql => schema-41110to41120.sql} | 11 +-
...cleanup.sql => schema-41120to41200-cleanup.sql} | 2 +-
...ma-41110to41200.sql => schema-41120to41200.sql} | 2 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 11 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 17 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 16 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 39 ++---
systemvm/debian/opt/cloud/bin/setup/router.sh | 63 ++++---
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 1 +
.../systemvmtemplate/scripts/apt_upgrade.sh | 4 +-
15 files changed, 133 insertions(+), 417 deletions(-)
diff --cc engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index a69590a,0000000..6da40fb
mode 100644,000000..100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@@ -1,387 -1,0 +1,387 @@@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.upgrade;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.ObjectArrays.concat;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Date;
+
+import javax.inject.Inject;
+
++import org.apache.cloudstack.utils.CloudStackVersion;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
- import com.google.common.annotations.VisibleForTesting;
-
- import org.apache.cloudstack.utils.CloudStackVersion;
-
+import com.cloud.upgrade.dao.DbUpgrade;
+import com.cloud.upgrade.dao.Upgrade217to218;
+import com.cloud.upgrade.dao.Upgrade218to22;
+import com.cloud.upgrade.dao.Upgrade218to224DomainVlans;
+import com.cloud.upgrade.dao.Upgrade2210to2211;
+import com.cloud.upgrade.dao.Upgrade2211to2212;
+import com.cloud.upgrade.dao.Upgrade2212to2213;
+import com.cloud.upgrade.dao.Upgrade2213to2214;
+import com.cloud.upgrade.dao.Upgrade2214to30;
+import com.cloud.upgrade.dao.Upgrade221to222;
+import com.cloud.upgrade.dao.Upgrade222to224;
+import com.cloud.upgrade.dao.Upgrade224to225;
+import com.cloud.upgrade.dao.Upgrade225to226;
+import com.cloud.upgrade.dao.Upgrade227to228;
+import com.cloud.upgrade.dao.Upgrade228to229;
+import com.cloud.upgrade.dao.Upgrade229to2210;
+import com.cloud.upgrade.dao.Upgrade301to302;
+import com.cloud.upgrade.dao.Upgrade302to303;
+import com.cloud.upgrade.dao.Upgrade302to40;
+import com.cloud.upgrade.dao.Upgrade303to304;
+import com.cloud.upgrade.dao.Upgrade304to305;
+import com.cloud.upgrade.dao.Upgrade305to306;
+import com.cloud.upgrade.dao.Upgrade306to307;
+import com.cloud.upgrade.dao.Upgrade307to410;
+import com.cloud.upgrade.dao.Upgrade30to301;
+import com.cloud.upgrade.dao.Upgrade40to41;
+import com.cloud.upgrade.dao.Upgrade41000to41100;
+import com.cloud.upgrade.dao.Upgrade410to420;
+import com.cloud.upgrade.dao.Upgrade41100to41110;
- import com.cloud.upgrade.dao.Upgrade41110to41200;
++import com.cloud.upgrade.dao.Upgrade41110to41120;
++import com.cloud.upgrade.dao.Upgrade41120to41200;
+import com.cloud.upgrade.dao.Upgrade420to421;
+import com.cloud.upgrade.dao.Upgrade421to430;
+import com.cloud.upgrade.dao.Upgrade430to440;
+import com.cloud.upgrade.dao.Upgrade431to440;
+import com.cloud.upgrade.dao.Upgrade432to440;
+import com.cloud.upgrade.dao.Upgrade440to441;
+import com.cloud.upgrade.dao.Upgrade441to442;
+import com.cloud.upgrade.dao.Upgrade442to450;
+import com.cloud.upgrade.dao.Upgrade443to444;
+import com.cloud.upgrade.dao.Upgrade444to450;
+import com.cloud.upgrade.dao.Upgrade450to451;
+import com.cloud.upgrade.dao.Upgrade451to452;
+import com.cloud.upgrade.dao.Upgrade452to453;
+import com.cloud.upgrade.dao.Upgrade453to460;
+import com.cloud.upgrade.dao.Upgrade460to461;
+import com.cloud.upgrade.dao.Upgrade461to470;
+import com.cloud.upgrade.dao.Upgrade470to471;
+import com.cloud.upgrade.dao.Upgrade471to480;
+import com.cloud.upgrade.dao.Upgrade480to481;
+import com.cloud.upgrade.dao.Upgrade481to490;
+import com.cloud.upgrade.dao.Upgrade490to4910;
+import com.cloud.upgrade.dao.Upgrade4910to4920;
+import com.cloud.upgrade.dao.Upgrade4920to4930;
+import com.cloud.upgrade.dao.Upgrade4930to41000;
+import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
+import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
+import com.cloud.upgrade.dao.VersionDao;
+import com.cloud.upgrade.dao.VersionDaoImpl;
+import com.cloud.upgrade.dao.VersionVO;
+import com.cloud.upgrade.dao.VersionVO.Step;
+import com.cloud.utils.component.SystemIntegrityChecker;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.ScriptRunner;
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.exception.CloudRuntimeException;
++import com.google.common.annotations.VisibleForTesting;
+
+public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
+ private static final Logger s_logger = Logger.getLogger(DatabaseUpgradeChecker.class);
+ private final DatabaseVersionHierarchy hierarchy;
+
+ @Inject
+ VersionDao _dao;
+
+ public DatabaseUpgradeChecker() {
+ _dao = new VersionDaoImpl();
+
+ hierarchy = DatabaseVersionHierarchy.builder()
+ // legacy
+ .next("2.1.7" , new Upgrade217to218())
+ .next("2.1.7.1" , new UpgradeSnapshot217to224())
+ .next("2.1.8" , new Upgrade218to22())
+ .next("2.1.8.1" , new Upgrade218to224DomainVlans())
+ .next("2.1.9" , new Upgrade218to22())
+ .next("2.2.1" , new Upgrade221to222())
+ .next("2.2.2" , new Upgrade222to224())
+ .next("2.2.3" , new Upgrade222to224())
+ .next("2.2.3.1" , new UpgradeSnapshot223to224())
+ .next("2.2.4" , new Upgrade224to225())
+ .next("2.2.5" , new Upgrade225to226())
+ .next("2.2.6" , new Upgrade227to228())
+ .next("2.2.7" , new Upgrade227to228())
+ .next("2.2.8" , new Upgrade228to229())
+ .next("2.2.9" , new Upgrade229to2210())
+ .next("2.2.10" , new Upgrade2210to2211())
+ .next("2.2.11" , new Upgrade2211to2212())
+ .next("2.2.12" , new Upgrade2212to2213())
+ .next("2.2.13" , new Upgrade2213to2214())
+ .next("2.2.14" , new Upgrade2214to30())
+ .next("2.2.15" , new Upgrade2214to30())
+ .next("2.2.16" , new Upgrade2214to30())
+ .next("3.0.0" , new Upgrade30to301())
+ .next("3.0.1" , new Upgrade301to302())
+ .next("3.0.2" , new Upgrade302to303())
+ .next("3.0.2.1" , new Upgrade302to40())
+ .next("3.0.3" , new Upgrade303to304())
+ .next("3.0.4" , new Upgrade304to305())
+ .next("3.0.5" , new Upgrade305to306())
+ .next("3.0.6" , new Upgrade306to307())
+ .next("3.0.7" , new Upgrade307to410())
+
+ // recent
+ .next("4.0.0" , new Upgrade40to41())
+ .next("4.0.1" , new Upgrade40to41())
+ .next("4.0.2" , new Upgrade40to41())
+ .next("4.1.0" , new Upgrade410to420())
+ .next("4.1.1" , new Upgrade410to420())
+ .next("4.2.0" , new Upgrade420to421())
+ .next("4.2.1" , new Upgrade421to430())
+ .next("4.3.0" , new Upgrade430to440())
+ .next("4.3.1" , new Upgrade431to440())
+ .next("4.3.2" , new Upgrade432to440())
+ .next("4.4.0" , new Upgrade440to441())
+ .next("4.4.1" , new Upgrade441to442())
+ .next("4.4.2" , new Upgrade442to450())
+ .next("4.4.3" , new Upgrade443to444())
+ .next("4.4.4" , new Upgrade444to450())
+ .next("4.5.0" , new Upgrade450to451())
+ .next("4.5.1" , new Upgrade451to452())
+ .next("4.5.2" , new Upgrade452to453())
+ .next("4.5.3" , new Upgrade453to460())
+ .next("4.6.0" , new Upgrade460to461())
+ .next("4.6.1" , new Upgrade461to470())
+ .next("4.6.2" , new Upgrade461to470())
+ .next("4.7.0" , new Upgrade470to471())
+ .next("4.7.1" , new Upgrade471to480())
+ .next("4.7.2" , new Upgrade471to480())
+ .next("4.8.0" , new Upgrade480to481())
+ .next("4.8.1" , new Upgrade481to490())
+ .next("4.8.2.0" , new Upgrade481to490())
+ .next("4.9.0" , new Upgrade490to4910())
+ .next("4.9.1.0" , new Upgrade4910to4920())
+ .next("4.9.2.0" , new Upgrade4920to4930())
+ .next("4.9.3.0" , new Upgrade4930to41000())
+ .next("4.9.3.1" , new Upgrade4930to41000())
+ .next("4.10.0.0", new Upgrade41000to41100())
+ .next("4.11.0.0", new Upgrade41100to41110())
- .next("4.11.1.0", new Upgrade41110to41200())
++ .next("4.11.1.0", new Upgrade41110to41120())
++ .next("4.11.2.0", new Upgrade41120to41200())
+ .build();
+ }
+
+ protected void runScript(Connection conn, InputStream file) {
+
+ try (InputStreamReader reader = new InputStreamReader(file)) {
+ ScriptRunner runner = new ScriptRunner(conn, false, true);
+ runner.runScript(reader);
+ } catch (IOException e) {
+ s_logger.error("Unable to read upgrade script", e);
+ throw new CloudRuntimeException("Unable to read upgrade script", e);
+ } catch (SQLException e) {
+ s_logger.error("Unable to execute upgrade script", e);
+ throw new CloudRuntimeException("Unable to execute upgrade script", e);
+ }
+
+ }
+
+ @VisibleForTesting
+ DbUpgrade[] calculateUpgradePath(final CloudStackVersion dbVersion, final CloudStackVersion currentVersion) {
+
+ checkArgument(dbVersion != null);
+ checkArgument(currentVersion != null);
+ checkArgument(currentVersion.compareTo(dbVersion) > 0);
+
+ final DbUpgrade[] upgrades = hierarchy.getPath(dbVersion, currentVersion);
+
+ // When there is no upgrade defined for the target version, we assume that there were no schema changes or
+ // data migrations required. Based on that assumption, we add a noop DbUpgrade to the end of the list ...
+ final CloudStackVersion tailVersion = upgrades.length > 0 ? CloudStackVersion.parse(upgrades[upgrades.length - 1].getUpgradedVersion()) : dbVersion;
+
+ if (currentVersion.compareTo(tailVersion) != 0) {
+ return concat(upgrades, new NoopDbUpgrade(tailVersion, currentVersion));
+ }
+
+ return upgrades;
+
+ }
+
+ protected void upgrade(CloudStackVersion dbVersion, CloudStackVersion currentVersion) {
+ s_logger.info("Database upgrade must be performed from " + dbVersion + " to " + currentVersion);
+
+ final DbUpgrade[] upgrades = calculateUpgradePath(dbVersion, currentVersion);
+
+ for (DbUpgrade upgrade : upgrades) {
+ VersionVO version;
+ s_logger.debug("Running upgrade " + upgrade.getClass().getSimpleName() + " to upgrade from " + upgrade.getUpgradableVersionRange()[0] + "-" + upgrade
+ .getUpgradableVersionRange()[1] + " to " + upgrade.getUpgradedVersion());
+ TransactionLegacy txn = TransactionLegacy.open("Upgrade");
+ txn.start();
+ try {
+ Connection conn;
+ try {
+ conn = txn.getConnection();
+ } catch (SQLException e) {
+ String errorMessage = "Unable to upgrade the database";
+ s_logger.error(errorMessage, e);
+ throw new CloudRuntimeException(errorMessage, e);
+ }
+ InputStream[] scripts = upgrade.getPrepareScripts();
+ if (scripts != null) {
+ for (InputStream script : scripts) {
+ runScript(conn, script);
+ }
+ }
+
+ upgrade.performDataMigration(conn);
+
+ version = new VersionVO(upgrade.getUpgradedVersion());
+ version = _dao.persist(version);
+
+ txn.commit();
+ } catch (CloudRuntimeException e) {
+ String errorMessage = "Unable to upgrade the database";
+ s_logger.error(errorMessage, e);
+ throw new CloudRuntimeException(errorMessage, e);
+ } finally {
+ txn.close();
+ }
+
+ // Run the corresponding '-cleanup.sql' script
+ txn = TransactionLegacy.open("Cleanup");
+ try {
+ s_logger.info("Cleanup upgrade " + upgrade.getClass().getSimpleName() + " to upgrade from " + upgrade.getUpgradableVersionRange()[0] + "-" + upgrade
+ .getUpgradableVersionRange()[1] + " to " + upgrade.getUpgradedVersion());
+
+ txn.start();
+ Connection conn;
+ try {
+ conn = txn.getConnection();
+ } catch (SQLException e) {
+ s_logger.error("Unable to cleanup the database", e);
+ throw new CloudRuntimeException("Unable to cleanup the database", e);
+ }
+
+ InputStream[] scripts = upgrade.getCleanupScripts();
+ if (scripts != null) {
+ for (InputStream script : scripts) {
+ runScript(conn, script);
+ s_logger.debug("Cleanup script " + upgrade.getClass().getSimpleName() + " is executed successfully");
+ }
+ }
+ txn.commit();
+
+ txn.start();
+ version.setStep(Step.Complete);
+ version.setUpdated(new Date());
+ _dao.update(version.getId(), version);
+ txn.commit();
+ s_logger.debug("Upgrade completed for version " + version.getVersion());
+ } finally {
+ txn.close();
+ }
+ }
+ }
+
+ @Override
+ public void check() {
+ GlobalLock lock = GlobalLock.getInternLock("DatabaseUpgrade");
+ try {
+ s_logger.info("Grabbing lock to check for database upgrade.");
+ if (!lock.lock(20 * 60)) {
+ throw new CloudRuntimeException("Unable to acquire lock to check for database integrity.");
+ }
+
+ try {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse(_dao.getCurrentVersion());
+ final String currentVersionValue = this.getClass().getPackage().getImplementationVersion();
+
+ if (StringUtils.isBlank(currentVersionValue)) {
+ return;
+ }
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse(currentVersionValue);
+ s_logger.info("DB version = " + dbVersion + " Code Version = " + currentVersion);
+
+ if (dbVersion.compareTo(currentVersion) > 0) {
+ throw new CloudRuntimeException("Database version " + dbVersion + " is higher than management software version " + currentVersionValue);
+ }
+
+ if (dbVersion.compareTo(currentVersion) == 0) {
+ s_logger.info("DB version and code version matches so no upgrade needed.");
+ return;
+ }
+
+ upgrade(dbVersion, currentVersion);
+ } finally {
+ lock.unlock();
+ }
+ } finally {
+ lock.releaseRef();
+ }
+ }
+
+ @VisibleForTesting
+ protected static final class NoopDbUpgrade implements DbUpgrade {
+
+ private final String upgradedVersion;
+ private final String[] upgradeRange;
+
+ private NoopDbUpgrade(final CloudStackVersion fromVersion, final CloudStackVersion toVersion) {
+
+ super();
+
+ upgradedVersion = toVersion.toString();
+ upgradeRange = new String[] {fromVersion.toString(), toVersion.toString()};
+
+ }
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return Arrays.copyOf(upgradeRange, upgradeRange.length);
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return upgradedVersion;
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public InputStream[] getPrepareScripts() {
+ return new InputStream[0];
+ }
+
+ @Override
+ public void performDataMigration(Connection conn) {
+
+ }
+
+ @Override
+ public InputStream[] getCleanupScripts() {
+ return new InputStream[0];
+ }
+
+ }
+}
diff --cc engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41120to41200.java
index c4fdd94,0000000..88cffb7
mode 100644,000000..100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41120to41200.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41120to41200.java
@@@ -1,68 -1,0 +1,68 @@@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.upgrade.dao;
+
+import java.io.InputStream;
+import java.sql.Connection;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+
- public class Upgrade41110to41200 implements DbUpgrade {
++public class Upgrade41120to41200 implements DbUpgrade {
+
+ @Override
+ public String[] getUpgradableVersionRange() {
- return new String[] {"4.11.1.0", "4.12.0.0"};
++ return new String[] {"4.11.2.0", "4.12.0.0"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.12.0.0";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public InputStream[] getPrepareScripts() {
- final String scriptFile = "META-INF/db/schema-41110to41200.sql";
++ final String scriptFile = "META-INF/db/schema-41120to41200.sql";
+ final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find " + scriptFile);
+ }
+
+ return new InputStream[] {script};
+ }
+
+ @Override
+ public void performDataMigration(Connection conn) {
+
+ }
+
+ @Override
+ public InputStream[] getCleanupScripts() {
- final String scriptFile = "META-INF/db/schema-41110to41200-cleanup.sql";
++ final String scriptFile = "META-INF/db/schema-41120to41200-cleanup.sql";
+ final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find " + scriptFile);
+ }
+
+ return new InputStream[] {script};
+ }
+}
diff --cc engine/schema/src/main/resources/META-INF/db/schema-41120to41200-cleanup.sql
index 76f6901,0000000..82cbfad
mode 100644,000000..100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41120to41200-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41120to41200-cleanup.sql
@@@ -1,27 -1,0 +1,27 @@@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
- -- Schema upgrade cleanup from 4.11.1.0 to 4.12.0.0
++-- Schema upgrade cleanup from 4.11.2.0 to 4.12.0.0
+--;
+
+DROP TABLE IF EXISTS `cloud`.`iam_account_policy_map`;
+DROP TABLE IF EXISTS `cloud`.`iam_group_account_map`;
+DROP TABLE IF EXISTS `cloud`.`iam_group_policy_map`;
+DROP TABLE IF EXISTS `cloud`.`iam_group`;
+DROP TABLE IF EXISTS `cloud`.`iam_policy_permission`;
+DROP TABLE IF EXISTS `cloud`.`iam_policy`;
diff --cc engine/schema/src/main/resources/META-INF/db/schema-41120to41200.sql
index de6865f,0000000..239f147
mode 100644,000000..100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41120to41200.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41120to41200.sql
@@@ -1,37 -1,0 +1,37 @@@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
- -- Schema upgrade from 4.11.1.0 to 4.12.0.0
++-- Schema upgrade from 4.11.2.0 to 4.12.0.0
+--;
+
+-- [CLOUDSTACK-10314] Add reason column to ACL rule table
+ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `reason` VARCHAR(2500) AFTER `display`;
+
+-- [CLOUDSTACK-9846] Make provision to store content and subject for Alerts in separate columns.
+ALTER TABLE `cloud`.`alert` ADD COLUMN `content` VARCHAR(5000);
+
+-- Fix the name of the column used to hold IPv4 range in 'vlan' table.
+ALTER TABLE `vlan` CHANGE `description` `ip4_range` varchar(255);
+
+-- [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
+-- We are only adding the permission to the default rules. Any custom rule must be configured by the root admin.
+INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 2, 'moveNetworkAclItem', 'ALLOW', 100) ON DUPLICATE KEY UPDATE rule=rule;
+INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 3, 'moveNetworkAclItem', 'ALLOW', 302) ON DUPLICATE KEY UPDATE rule=rule;
+INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 4, 'moveNetworkAclItem', 'ALLOW', 260) ON DUPLICATE KEY UPDATE rule=rule;
+
+UPDATE `cloud`.`async_job` SET `removed` = now() WHERE `removed` IS NULL;
diff --cc engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
index 3e2995d,0000000..65e222d
mode 100644,000000..100644
--- a/engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
+++ b/engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
@@@ -1,170 -1,0 +1,171 @@@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.upgrade;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
- import org.junit.Test;
-
+import org.apache.cloudstack.utils.CloudStackVersion;
++import org.junit.Test;
+
+import com.cloud.upgrade.DatabaseUpgradeChecker.NoopDbUpgrade;
+import com.cloud.upgrade.dao.DbUpgrade;
+import com.cloud.upgrade.dao.Upgrade41000to41100;
+import com.cloud.upgrade.dao.Upgrade41100to41110;
- import com.cloud.upgrade.dao.Upgrade41110to41200;
++import com.cloud.upgrade.dao.Upgrade41110to41120;
++import com.cloud.upgrade.dao.Upgrade41120to41200;
+import com.cloud.upgrade.dao.Upgrade452to453;
+import com.cloud.upgrade.dao.Upgrade453to460;
+import com.cloud.upgrade.dao.Upgrade460to461;
+import com.cloud.upgrade.dao.Upgrade461to470;
+import com.cloud.upgrade.dao.Upgrade470to471;
+import com.cloud.upgrade.dao.Upgrade471to480;
+import com.cloud.upgrade.dao.Upgrade480to481;
+import com.cloud.upgrade.dao.Upgrade490to4910;
+
+public class DatabaseUpgradeCheckerTest {
+
+ @Test
+ public void testCalculateUpgradePath480to481() {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse("4.8.0");
+ assertNotNull(dbVersion);
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse("4.8.1");
+ assertNotNull(currentVersion);
+
+ final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+ final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+
+ assertNotNull(upgrades);
+ assertTrue(upgrades.length >= 1);
+ assertTrue(upgrades[0] instanceof Upgrade480to481);
+
+ }
+
+ @Test
+ public void testCalculateUpgradePath490to4910() {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse("4.9.0");
+ assertNotNull(dbVersion);
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse("4.9.1.0");
+ assertNotNull(currentVersion);
+
+ final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+ final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+
+ assertNotNull(upgrades);
+ assertTrue(upgrades.length >= 1);
+ assertTrue(upgrades[0] instanceof Upgrade490to4910);
+
+ assertTrue(Arrays.equals(new String[] {"4.9.0", currentVersion.toString()}, upgrades[0].getUpgradableVersionRange()));
+ assertEquals(currentVersion.toString(), upgrades[0].getUpgradedVersion());
+
+ }
+
+ @Test
+ public void testCalculateUpgradePath410to412() {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse("4.10.0.0");
+ assertNotNull(dbVersion);
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse("4.12.0.0");
+ assertNotNull(currentVersion);
+
+ final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+ final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+
+ assertNotNull(upgrades);
+ assertTrue(upgrades.length >= 1);
+ assertTrue(upgrades[0] instanceof Upgrade41000to41100);
+ assertTrue(upgrades[1] instanceof Upgrade41100to41110);
- assertTrue(upgrades[2] instanceof Upgrade41110to41200);
++ assertTrue(upgrades[2] instanceof Upgrade41110to41120);
++ assertTrue(upgrades[3] instanceof Upgrade41120to41200);
+
+ assertTrue(Arrays.equals(new String[] {"4.11.0.0", "4.11.1.0"}, upgrades[1].getUpgradableVersionRange()));
- assertEquals(currentVersion.toString(), upgrades[2].getUpgradedVersion());
++ assertEquals(currentVersion.toString(), upgrades[3].getUpgradedVersion());
+
+ }
+
+ @Test
+ public void testFindUpgradePath470to481() {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse("4.7.0");
+ assertNotNull(dbVersion);
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse("4.8.1");
+ assertNotNull(currentVersion);
+
+ final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+ final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+
+ assertNotNull(upgrades);
+
+ assertTrue(upgrades[0] instanceof Upgrade470to471);
+ assertTrue(upgrades[1] instanceof Upgrade471to480);
+ assertTrue(upgrades[2] instanceof Upgrade480to481);
+
+ }
+
+ @Test
+ public void testFindUpgradePath452to490() {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse("4.5.2");
+ assertNotNull(dbVersion);
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse("4.9.0");
+ assertNotNull(currentVersion);
+
+ final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+ final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+
+ assertNotNull(upgrades);
+
+ assertTrue(upgrades[0] instanceof Upgrade452to453);
+ assertTrue(upgrades[1] instanceof Upgrade453to460);
+ assertTrue(upgrades[2] instanceof Upgrade460to461);
+ assertTrue(upgrades[3] instanceof Upgrade461to470);
+ assertTrue(upgrades[4] instanceof Upgrade470to471);
+ assertTrue(upgrades[5] instanceof Upgrade471to480);
+ assertTrue(upgrades[6] instanceof Upgrade480to481);
+
+ assertTrue(Arrays.equals(new String[] {"4.8.1", currentVersion.toString()}, upgrades[upgrades.length - 1].getUpgradableVersionRange()));
+ assertEquals(currentVersion.toString(), upgrades[upgrades.length - 1].getUpgradedVersion());
+ }
+
+ @Test
+ public void testCalculateUpgradePathUnkownDbVersion() {
+
+ final CloudStackVersion dbVersion = CloudStackVersion.parse("4.99.0.0");
+ assertNotNull(dbVersion);
+
+ final CloudStackVersion currentVersion = CloudStackVersion.parse("4.99.1.0");
+ assertNotNull(currentVersion);
+
+ final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+ final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, currentVersion);
+ assertNotNull(upgrades);
+ assertTrue(upgrades.length == 1);
+ assertTrue(upgrades[0] instanceof NoopDbUpgrade);
+
+ }
+
+}