You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2020/05/20 07:03:30 UTC
[GitHub] [cloudstack] shwstppr opened a new pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
shwstppr opened a new pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092
## Description
Empty DB upgrade path from 4.14.0.0 to 4.15.0.0
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
## Screenshots (if appropriate):
## How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document -->
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-634423191
<b>Trillian test result (tid-1569)</b>
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46575 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4092-t1569-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 78 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-633932326
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-638225424
I am having second thoughts about this one @rhtyd @shwstppr ! we shouldn't have to install the 4.14 templates when upgrade from 4.14, should we? these should already be in place.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-638570464
@DaanHoogland you're right I actually wanted that to be moved to 4.14-4.15 upgrade path so I can fix it in here - https://github.com/apache/cloudstack/pull/4104/files We'll have a new systemvmtemplate for 4.15 (Debian 10 based). It won't be problem if we merge #4104
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-631293569
Packaging result: ✔centos7 ✔debian. JID-1235
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-634084324
@blueorangutan test matrix
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
shwstppr commented on a change in pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#discussion_r430493752
##########
File path: engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java
##########
@@ -0,0 +1,248 @@
+// 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 java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class Upgrade41400to41500 implements DbUpgrade {
+
+ final static Logger LOG = Logger.getLogger(Upgrade41400to41500.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.14.0.0", "4.15.0.0"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.15.0.0";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public InputStream[] getPrepareScripts() {
+ final String scriptFile = "META-INF/db/schema-41400to41500.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) {
+ updateSystemVmTemplates(conn);
+ }
+
+ @SuppressWarnings("serial")
+ private void updateSystemVmTemplates(final Connection conn) {
Review comment:
@rhtyd removed the systemvm code from 41310to41400. Please confirm if it is fine now
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-633931900
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#issuecomment-638655784
ok, @rhtyd that means we must give that one high priority as no update (addmittedly of dev envs only) will work
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd closed pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
rhtyd closed pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd merged pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
rhtyd merged pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4092: engine/schema: add empty DB upgrade path from 4.14.0.0 to 4.15.0.0
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #4092:
URL: https://github.com/apache/cloudstack/pull/4092#discussion_r430298633
##########
File path: engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java
##########
@@ -0,0 +1,248 @@
+// 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 java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class Upgrade41400to41500 implements DbUpgrade {
+
+ final static Logger LOG = Logger.getLogger(Upgrade41400to41500.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.14.0.0", "4.15.0.0"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.15.0.0";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public InputStream[] getPrepareScripts() {
+ final String scriptFile = "META-INF/db/schema-41400to41500.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) {
+ updateSystemVmTemplates(conn);
+ }
+
+ @SuppressWarnings("serial")
+ private void updateSystemVmTemplates(final Connection conn) {
Review comment:
@shwstppr can you remove any similar check in the previous upgrade path 4.13->4.14 for example? We don't want multiple instances of systemvm migration code in older upgrade paths.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org