You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2021/11/10 16:16:22 UTC
[cloudstack] branch main updated (3f79436 -> e27dd53)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 3f79436 Updating pom.xml version numbers for release 4.17.0.0-SNAPSHOT
add 462e051 Fix version and add schema upgrade path
add bdab514 New upgrade schema path and workaround for system VM template auto registration
new b0bf069 Merge branch '4.16' into main
new e27dd53 Fix build and version numbers
The 2 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:
debian/changelog | 6 +++
engine/schema/pom.xml | 4 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 4 ++
.../upgrade/SystemVmTemplateRegistration.java | 28 ++++++++++---
...e41120to41200.java => Upgrade41600to41610.java} | 46 ++++++++++++---------
...e41120to41200.java => Upgrade41610to41700.java} | 47 ++++++++++++----------
...cleanup.sql => schema-41600to41610-cleanup.sql} | 5 +--
...schema-441to442.sql => schema-41600to41610.sql} | 5 +--
...cleanup.sql => schema-41610to41700-cleanup.sql} | 5 +--
...schema-441to442.sql => schema-41610to41700.sql} | 5 +--
tools/checkstyle/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/marvin/setup.py | 2 +-
14 files changed, 99 insertions(+), 64 deletions(-)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41120to41200.java => Upgrade41600to41610.java} (65%)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41120to41200.java => Upgrade41610to41700.java} (66%)
copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql => schema-41600to41610-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-441to442.sql => schema-41600to41610.sql} (94%)
copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql => schema-41610to41700-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-441to442.sql => schema-41610to41700.sql} (94%)
[cloudstack] 01/02: Merge branch '4.16' into main
Posted by nv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b0bf069bcf31dd94a2a60d41b07c2570f6d06403
Merge: 3f79436 bdab514
Author: nicolas <ni...@gmail.com>
AuthorDate: Wed Nov 10 12:59:28 2021 -0300
Merge branch '4.16' into main
debian/changelog | 6 ++
engine/schema/pom.xml | 4 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 +
.../upgrade/SystemVmTemplateRegistration.java | 28 +++++--
.../com/cloud/upgrade/dao/Upgrade41600to41610.java | 87 ++++++++++++++++++++++
.../META-INF/db/schema-41600to41610-cleanup.sql | 20 +++++
.../resources/META-INF/db/schema-41600to41610.sql | 20 +++++
tools/checkstyle/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/marvin/setup.py | 2 +-
11 files changed, 164 insertions(+), 11 deletions(-)
[cloudstack] 02/02: Fix build and version numbers
Posted by nv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e27dd536977dc35ea899a9975bf9bb3104631ff6
Author: nicolas <ni...@gmail.com>
AuthorDate: Wed Nov 10 13:15:46 2021 -0300
Fix build and version numbers
---
debian/changelog | 6 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 +
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 86 ++++++++++++++++++++++
.../META-INF/db/schema-41610to41700-cleanup.sql | 20 +++++
.../resources/META-INF/db/schema-41610to41700.sql | 20 +++++
tools/checkstyle/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/marvin/setup.py | 2 +-
9 files changed, 135 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e8d490b..0931ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-cloudstack (4.16.1.0-SNAPSHOT) unstable; urgency=low
+cloudstack (4.17.0.0-SNAPSHOT) unstable; urgency=low
- * Update the version to 4.16.1.0-SNAPSHOT
+ * Update the version to 4.17.0.0-SNAPSHOT
- -- the Apache CloudStack project <de...@cloudstack.apache.org> Wed, 10 Nov 2021 11:31:57 -0300
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Wed, 10 Nov 2021 12:31:57 -0300
cloudstack (4.16.0.0) unstable; urgency=low
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index cf3f728..604b310 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -31,6 +31,7 @@ import javax.inject.Inject;
import com.cloud.upgrade.dao.Upgrade41510to41520;
import com.cloud.upgrade.dao.Upgrade41600to41610;
+import com.cloud.upgrade.dao.Upgrade41610to41700;
import org.apache.cloudstack.utils.CloudStackVersion;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -203,6 +204,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
.next("4.15.1.0", new Upgrade41510to41520())
.next("4.15.2.0", new Upgrade41520to41600())
.next("4.16.0.0", new Upgrade41600to41610())
+ .next("4.16.1.0", new Upgrade41610to41700())
.build();
}
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41610to41700.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41610to41700.java
new file mode 100644
index 0000000..7d65b43
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41610to41700.java
@@ -0,0 +1,86 @@
+// 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 com.cloud.upgrade.SystemVmTemplateRegistration;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.log4j.Logger;
+
+import java.io.InputStream;
+import java.sql.Connection;
+
+public class Upgrade41610to41700 implements DbUpgrade, DbUpgradeSystemVmTemplate {
+
+ final static Logger LOG = Logger.getLogger(Upgrade41610to41700.class);
+ private SystemVmTemplateRegistration systemVmTemplateRegistration;
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.16.1.0", "4.17.0.0"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.17.0.0";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public InputStream[] getPrepareScripts() {
+ final String scriptFile = "META-INF/db/schema-41610to41700.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-41610to41700-cleanup.sql";
+ final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find " + scriptFile);
+ }
+
+ return new InputStream[] {script};
+ }
+
+ private void initSystemVmTemplateRegistration() {
+ systemVmTemplateRegistration = new SystemVmTemplateRegistration("4.16.0");
+ }
+
+ @Override
+ public void updateSystemVmTemplates(Connection conn) {
+ LOG.debug("Updating System Vm template IDs");
+ initSystemVmTemplateRegistration();
+ try {
+ systemVmTemplateRegistration.updateSystemVmTemplates(conn);
+ } catch (Exception e) {
+ throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
+ }
+ }
+}
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql
new file mode 100644
index 0000000..667168b
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.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 cleanup from 4.16.1.0 to 4.17.0.0
+--;
\ No newline at end of file
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
new file mode 100644
index 0000000..6e4a27a
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.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.16.1.0 to 4.17.0.0
+--;
\ No newline at end of file
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index 1438819..9981934 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -22,7 +22,7 @@
<name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
- <version>4.16.1.0-SNAPSHOT</version>
+ <version>4.17.0.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 31b56b8..c1bb176 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
FROM ubuntu:20.04
MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.17.0.0-SNAPSHOT"
ARG DEBIAN_FRONTEND=noninteractive
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index b7cfaa3..3bef450 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -20,7 +20,7 @@
FROM python:2
MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.17.0.0-SNAPSHOT"
ENV WORK_DIR=/marvin
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index d0d97a8..c30ce5f 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -27,7 +27,7 @@ except ImportError:
raise RuntimeError("python setuptools is required to build Marvin")
-VERSION = "4.16.1.0-SNAPSHOT"
+VERSION = "4.17.0.0-SNAPSHOT"
setup(name="Marvin",
version=VERSION,