CLOUDSTACK-4167: Put in upgrade paths in master for 4.1.2 and 4.2
Description:
Define upgrade paths from 4.1.0 to 4.1.1, and 4.1.1 to 4.1.2,
and 4.1.2 to 4.2.0. This new path will replace the existing
4.1.0 to 4.2.0 path. This is required to allow upgrades from
4.1.2 installations to 4.2.0. The 4.1.2 installation will have
that db version upon installation from the 4.1 branch. Please
note that these new upgrade paths are empty and don't make
any SQL schema modifications.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d47b4a99
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d47b4a99
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d47b4a99
Branch: refs/heads/4.2
Commit: d47b4a994923246225131624ab806485987ee01f
Parents: e61a380
Author: Vijayendra Bhamidipati <[email protected]>
Authored: Wed Aug 7 11:53:42 2013 -0700
Committer: Vijayendra <[email protected]>
Committed: Fri Aug 9 18:23:58 2013 -0700
----------------------------------------------------------------------
.../cloud/upgrade/DatabaseUpgradeChecker.java | 104 +-
.../com/cloud/upgrade/dao/Upgrade410to411.java | 77 +
.../com/cloud/upgrade/dao/Upgrade410to420.java | 2115 ----------------
.../com/cloud/upgrade/dao/Upgrade411to412.java | 77 +
.../com/cloud/upgrade/dao/Upgrade412to420.java | 2115 ++++++++++++++++
setup/db/db/schema-410to420-cleanup.sql | 28 -
setup/db/db/schema-410to420.sql | 2291 ------------------
setup/db/db/schema-412to420-cleanup.sql | 26 +
setup/db/db/schema-412to420.sql | 2291 ++++++++++++++++++
9 files changed, 4657 insertions(+), 4467 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d47b4a99/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 7232058..d49a884 100755
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -61,7 +61,9 @@ 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.Upgrade410to420;
+import com.cloud.upgrade.dao.Upgrade410to411;
+import com.cloud.upgrade.dao.Upgrade411to412;
+import com.cloud.upgrade.dao.Upgrade412to420;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
import com.cloud.upgrade.dao.VersionDao;
@@ -88,108 +90,144 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new UpgradeSnapshot217to224(), new Upgrade222to224(), new
Upgrade224to225(), new Upgrade225to226(),
new Upgrade227to228(), new Upgrade228to229(), new
Upgrade229to2210(), new Upgrade2210to2211(),
new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(), new Upgrade2214to30(),
- new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new
Upgrade221to222(), new UpgradeSnapshot217to224(),
new Upgrade222to224(), new Upgrade218to224DomainVlans(), new
Upgrade224to225(), new Upgrade225to226(),
new Upgrade227to228(), new Upgrade228to229(), new
Upgrade229to2210(), new Upgrade2210to2211(),
new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(),
- new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new
Upgrade221to222(), new UpgradeSnapshot217to224(),
new Upgrade222to224(), new Upgrade218to224DomainVlans(), new
Upgrade224to225(), new Upgrade225to226(),
new Upgrade227to228(), new Upgrade228to229(), new
Upgrade229to2210(), new Upgrade2210to2211(),
new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(), new Upgrade2214to30(),
- new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new
UpgradeSnapshot223to224(), new Upgrade222to224(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228(), new Upgrade228to229(),
new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212(), new Upgrade2212to2213(),
- new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new
UpgradeSnapshot223to224(), new Upgrade224to225(),
new Upgrade225to226(), new Upgrade227to228(), new
Upgrade228to229(), new Upgrade229to2210(),
new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(), new Upgrade2213to2214(),
- new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new
UpgradeSnapshot223to224(), new Upgrade224to225(),
new Upgrade225to226(), new Upgrade227to228(), new
Upgrade228to229(), new Upgrade229to2210(),
new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(), new Upgrade2213to2214(),
- new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new
Upgrade225to226(), new Upgrade227to228(),
new Upgrade228to229(), new Upgrade229to2210(), new
Upgrade2210to2211(), new Upgrade2211to2212(),
new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(), new Upgrade30to301(),
- new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new
Upgrade227to228(), new Upgrade228to229(),
new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212(), new Upgrade2212to2213(),
new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
- new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228(), new
Upgrade228to229(), new Upgrade229to2210(),
new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(), new Upgrade2213to2214(),
- new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.7", new DbUpgrade[] { new Upgrade227to228(), new
Upgrade228to229(), new Upgrade229to2210(),
new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(),
- new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.8", new DbUpgrade[] { new Upgrade228to229(), new
Upgrade229to2210(), new Upgrade2210to2211(),
- new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(), new Upgrade2214to30()
- , new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
new Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(), new Upgrade2214to30(),
+ new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.9", new DbUpgrade[] { new Upgrade229to2210(), new
Upgrade2210to2211(), new Upgrade2211to2212(),
new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(), new Upgrade30to301(),
- new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.10", new DbUpgrade[] { new Upgrade2210to2211(),
new Upgrade2211to2212(), new Upgrade2212to2213(),
- new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.11", new DbUpgrade[] { new Upgrade2211to2212(),
new Upgrade2212to2213(), new Upgrade2213to2214(),
- new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.12", new DbUpgrade[] { new Upgrade2212to2213(),
new Upgrade2213to2214(), new Upgrade2214to30(),
- new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(),
new Upgrade2214to30(), new Upgrade30to301(),
- new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.14", new DbUpgrade[] { new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
- new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420() });
+ _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
+
+ _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
+
+ _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40(), new
Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
+
+ _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
+ _upgradeMap.put("4.0.1", new DbUpgrade[] { new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420() });
+ _upgradeMap.put("4.0.2", new DbUpgrade[] { new Upgrade40to41(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41(), new
Upgrade410to420() });
+ _upgradeMap.put("4.1.0", new DbUpgrade[] { new Upgrade410to411(), new
Upgrade411to412(), new Upgrade412to420() });
- _upgradeMap.put("4.0.1", new DbUpgrade[] { new Upgrade40to41(), new
Upgrade410to420() });
+ _upgradeMap.put("4.1.1", new DbUpgrade[] { new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("4.0.2", new DbUpgrade[] { new Upgrade40to41(), new
Upgrade410to420() });
+ _upgradeMap.put("4.1.2", new DbUpgrade[] { new Upgrade412to420() });
- _upgradeMap.put("4.1.0", new DbUpgrade[] { new Upgrade410to420() });
+ //_upgradeMap.put("4.1.0", new DbUpgrade[] { new Upgrade410to420() });
//CP Upgrades
- _upgradeMap.put("3.0.3", new DbUpgrade[] { new Upgrade303to304(), new
Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new
Upgrade307to410(), new Upgrade410to420() });
+ _upgradeMap.put("3.0.3", new DbUpgrade[] { new Upgrade303to304(), new
Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new
Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.4", new DbUpgrade[] { new Upgrade304to305(), new
Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new
Upgrade410to420() });
+ _upgradeMap.put("3.0.4", new DbUpgrade[] { new Upgrade304to305(), new
Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.5", new DbUpgrade[] { new Upgrade305to306(), new
Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420() });
+ _upgradeMap.put("3.0.5", new DbUpgrade[] { new Upgrade305to306(), new
Upgrade306to307(), new Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.6", new DbUpgrade[] { new Upgrade306to307(), new
Upgrade307to410(), new Upgrade410to420() });
+ _upgradeMap.put("3.0.6", new DbUpgrade[] { new Upgrade306to307(), new
Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
- _upgradeMap.put("3.0.7", new DbUpgrade[] { new Upgrade307to410(), new
Upgrade410to420() });
+ _upgradeMap.put("3.0.7", new DbUpgrade[] { new Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.15", new DbUpgrade[] { new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
- new Upgrade302to303(), new Upgrade303to304(), new
Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(),new
Upgrade307to410(), new Upgrade410to420()});
+ new Upgrade302to303(), new Upgrade303to304(), new
Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(),new
Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
_upgradeMap.put("2.2.16", new DbUpgrade[] { new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
- new Upgrade302to303(), new Upgrade303to304(), new
Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(),new
Upgrade307to410(), new Upgrade410to420()});
+ new Upgrade302to303(), new Upgrade303to304(), new
Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(),new
Upgrade307to410(),
+ new Upgrade410to411(), new Upgrade411to412(), new
Upgrade412to420() });
}
protected void runScript(Connection conn, File file) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d47b4a99/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to411.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to411.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to411.java
new file mode 100644
index 0000000..916e830
--- /dev/null
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to411.java
@@ -0,0 +1,77 @@
+// 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.File;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
+import org.apache.log4j.Logger;
+
+import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.vpc.NetworkACL;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+
+public class Upgrade410to411 implements DbUpgrade {
+ final static Logger s_logger = Logger.getLogger(Upgrade410to411.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] { "4.1.0", "4.1.1" };
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.1.1";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public File[] getPrepareScripts() {
+ // Do nothing.
+ return null;
+ }
+
+ @Override
+ public void performDataMigration(Connection conn) {
+ // Nothing to be done
+ }
+
+ @Override
+ public File[] getCleanupScripts() {
+ return null;
+ }
+}
