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/06/26 00:09:36 UTC
git commit: updated refs/heads/master to 582687f
Repository: cloudstack
Updated Branches:
refs/heads/master bdd42a415 -> 582687fb3
4.4.4 to 4.5.2 upgrade
Conflicts:
engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #529
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/582687fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/582687fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/582687fb
Branch: refs/heads/master
Commit: 582687fb3f5e17fd8ccbedee68eefff0eef3e44a
Parents: bdd42a4
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Apr 19 18:10:03 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Jun 26 00:07:44 2015 +0200
----------------------------------------------------------------------
.../cloud/upgrade/DatabaseUpgradeChecker.java | 3 +
.../com/cloud/upgrade/dao/Upgrade443to444.java | 64 ++++++++++++++++++++
.../com/cloud/upgrade/dao/Upgrade444to450.java | 30 +++++++++
setup/db/db/schema-443to444.sql | 20 ++++++
4 files changed, 117 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582687fb/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 ff8fce6..4bc54b1 100644
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -72,6 +72,7 @@ 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.Upgrade444to450;
import com.cloud.upgrade.dao.Upgrade450to451;
import com.cloud.upgrade.dao.Upgrade451to460;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
@@ -231,6 +232,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
_upgradeMap.put("4.4.3", new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(), new Upgrade451to460()});
+ _upgradeMap.put("4.4.4", new DbUpgrade[] {new Upgrade444to450(), 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/582687fb/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to444.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to444.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to444.java
new file mode 100644
index 0000000..ded67d6
--- /dev/null
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade443to444.java
@@ -0,0 +1,64 @@
+// 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 org.apache.log4j.Logger;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+
+public class Upgrade443to444 implements DbUpgrade {
+ final static Logger s_logger = Logger.getLogger(Upgrade443to444.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.4.3", "4.4.4"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.4.4";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public File[] getPrepareScripts() {
+ String script = Script.findScript("", "db/schema-443to444.sql");
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find db/schema-empty.sql");
+ }
+
+ return new File[] {new File(script)};
+ }
+
+ @Override
+ public void performDataMigration(Connection conn) {
+ }
+
+ @Override
+ public File[] getCleanupScripts() {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582687fb/engine/schema/src/com/cloud/upgrade/dao/Upgrade444to450.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade444to450.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade444to450.java
new file mode 100644
index 0000000..d872e52
--- /dev/null
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade444to450.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 Upgrade444to450 extends Upgrade442to450 implements DbUpgrade {
+
+ final static Logger s_logger = Logger.getLogger(Upgrade444to450.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.4.4", "4.5.0"};
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582687fb/setup/db/db/schema-443to444.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-443to444.sql b/setup/db/db/schema-443to444.sql
new file mode 100644
index 0000000..44e0406
--- /dev/null
+++ b/setup/db/db/schema-443to444.sql
@@ -0,0 +1,20 @@
+-- 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.4.3 to 4.4.4;
+--;