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 2021/01/20 13:27:14 UTC
[cloudstack] branch 4.15 updated (abfe0b0 -> 8a9ae6f)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from abfe0b0 merge: Merge apache/cloudstack-primate repo under 'ui' (#4598)
add ec4d83d vmware: Fixed instance creation failure on dvswitch when using vlan id 4095 (#4557)
add f70da10 engine/schema: add upgrade path from 4.14.0.0 to 4.14.1.0 (#4580)
new 8a9ae6f Merge remote-tracking branch 'origin/4.14' into 4.15
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:
.../main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +++
.../{Upgrade41310to41400.java => Upgrade41500to41510.java} | 12 ++++++------
.../{schema-441to442.sql => schema-41500to41510-cleanup.sql} | 2 +-
.../{schema-40to410-cleanup.sql => schema-41500to41510.sql} | 2 +-
.../com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 4 ++++
5 files changed, 15 insertions(+), 8 deletions(-)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41310to41400.java => Upgrade41500to41510.java} (84%)
copy engine/schema/src/main/resources/META-INF/db/{schema-441to442.sql => schema-41500to41510-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql => schema-41500to41510.sql} (94%)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14' into
4.15
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 8a9ae6fcee726f3d4404ee0c1036145971d3f0de
Merge: abfe0b0 f70da10
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Jan 20 18:37:50 2021 +0530
Merge remote-tracking branch 'origin/4.14' into 4.15
Fix upgrade path conflicts, add 4.15.0.0->4.15.1.0 stub
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 71 ++++++++++++++++++++++
.../META-INF/db/schema-41500to41510-cleanup.sql | 21 +++++++
.../resources/META-INF/db/schema-41500to41510.sql | 21 +++++++
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 4 ++
5 files changed, 120 insertions(+)
diff --cc engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 7db4e4c,43ecbde..ba18565
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@@ -68,7 -68,7 +68,8 @@@ import com.cloud.upgrade.dao.Upgrade411
import com.cloud.upgrade.dao.Upgrade41200to41300;
import com.cloud.upgrade.dao.Upgrade41300to41310;
import com.cloud.upgrade.dao.Upgrade41310to41400;
-import com.cloud.upgrade.dao.Upgrade41400to41410;
+import com.cloud.upgrade.dao.Upgrade41400to41500;
++import com.cloud.upgrade.dao.Upgrade41500to41510;
import com.cloud.upgrade.dao.Upgrade420to421;
import com.cloud.upgrade.dao.Upgrade421to430;
import com.cloud.upgrade.dao.Upgrade430to440;
@@@ -192,7 -192,7 +193,9 @@@ public class DatabaseUpgradeChecker imp
.next("4.12.0.0", new Upgrade41200to41300())
.next("4.13.0.0", new Upgrade41300to41310())
.next("4.13.1.0", new Upgrade41310to41400())
- .next("4.14.0.0", new Upgrade41400to41410())
+ .next("4.14.0.0", new Upgrade41400to41500())
++ .next("4.14.1.0", new Upgrade41400to41500())
++ .next("4.15.0.0", new Upgrade41500to41510())
.build();
}
diff --cc engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java
index 0000000,0000000..6ef5def
new file mode 100644
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41500to41510.java
@@@ -1,0 -1,0 +1,71 @@@
++// 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 org.apache.log4j.Logger;
++
++import com.cloud.utils.exception.CloudRuntimeException;
++
++public class Upgrade41500to41510 implements DbUpgrade {
++
++ final static Logger LOG = Logger.getLogger(Upgrade41500to41510.class);
++
++ @Override
++ public String[] getUpgradableVersionRange() {
++ return new String[] {"4.15.0.0", "4.15.1.0"};
++ }
++
++ @Override
++ public String getUpgradedVersion() {
++ return "4.15.1.0";
++ }
++
++ @Override
++ public boolean supportsRollingUpgrade() {
++ return false;
++ }
++
++ @Override
++ public InputStream[] getPrepareScripts() {
++ final String scriptFile = "META-INF/db/schema-41500to41510.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-41500to41510-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-41500to41510-cleanup.sql
index 0000000,0000000..0939030
new file mode 100644
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41500to41510-cleanup.sql
@@@ -1,0 -1,0 +1,21 @@@
++-- 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.15.0.0 to 4.15.1.0
++--;
++
diff --cc engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql
index 0000000,0000000..caafde6
new file mode 100644
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql
@@@ -1,0 -1,0 +1,21 @@@
++-- 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.15.0.0 to 4.15.1.0
++--;
++