You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/25 07:08:45 UTC
git commit: updated refs/heads/master to caba04d
Repository: cloudstack
Updated Branches:
refs/heads/master ead41f921 -> caba04d17
engine: add DB upgrade path from 4.4.3 to 4.5.0/4.5.1
Upgrade path extends over upgrade path from 4.4.2 to 4.5.0
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit e3e59c544cc62c53f276595068226d70d5dd87a4)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/caba04d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/caba04d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/caba04d1
Branch: refs/heads/master
Commit: caba04d173236a3c6fee60031e8a374bbcd9cf87
Parents: ead41f9
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Mar 25 11:32:51 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Mar 25 11:38:39 2015 +0530
----------------------------------------------------------------------
.../cloud/upgrade/DatabaseUpgradeChecker.java | 3 ++
.../com/cloud/upgrade/dao/Upgrade443to450.java | 30 ++++++++++++++++++++
2 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/caba04d1/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 99f6508..ff8fce6 100644
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -71,6 +71,7 @@ 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.Upgrade443to450;
import com.cloud.upgrade.dao.Upgrade450to451;
import com.cloud.upgrade.dao.Upgrade451to460;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
@@ -228,6 +229,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
_upgradeMap.put("4.4.2", new DbUpgrade[] {new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
+ _upgradeMap.put("4.4.3", new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(), new Upgrade451to460()});
+
_upgradeMap.put("4.5.0", new DbUpgrade[] {new Upgrade450to451(), new Upgrade451to460()});
_upgradeMap.put("4.5.1", new DbUpgrade[] {new Upgrade451to460()});
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/caba04d1/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to450.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to450.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to450.java
new file mode 100644
index 0000000..9834948
--- /dev/null
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to450.java
@@ -0,0 +1,30 @@
+// 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 org.apache.log4j.Logger;
+
+public class Upgrade443to450 extends Upgrade442to450 implements DbUpgrade {
+
+ final static Logger s_logger = Logger.getLogger(Upgrade443to450.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.4.3", "4.5.0"};
+ }
+}