DatabaseUpgradeChecker: add upgrade path from 4.17.0.1 to 4.17.1.0#6759
Merged
shwstppr merged 1 commit intoapache:4.17from Sep 23, 2022
Merged
DatabaseUpgradeChecker: add upgrade path from 4.17.0.1 to 4.17.1.0#6759shwstppr merged 1 commit intoapache:4.17from
shwstppr merged 1 commit intoapache:4.17from
Conversation
This needs checking if it's even needed at all Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
yadvr
commented
Sep 22, 2022
| .next("4.16.1.0", new Upgrade41610to41700()) | ||
| .next("4.16.1.1", new Upgrade41610to41700()) | ||
| .next("4.17.0.0", new Upgrade41700to41710()) | ||
| .next("4.17.0.1", new Upgrade41700to41710()) |
Member
Author
There was a problem hiding this comment.
Not an issue, if somehow it won't matter or doesn't matter; and this somehow runs while upgrading from 4.17.0.1.
Contributor
There was a problem hiding this comment.
it should @rohityadavcloud , but that is as designed. db upgrades historically ignore the last digit. Did you add this PR because of an upgrade problem @rohityadavcloud ?
Contributor
There was a problem hiding this comment.
@rohityadavcloud this is needed. Upgrading from 4.17.0.1 to 4.17.1.0 doesn't apply schema changes
2022-09-23 09:17:30,348 INFO [o.a.c.s.l.CloudStackExtendedLifeCycle] (main:null) (logid:) Running system integrity checker com.cloud.upgrade.DatabaseUpgradeChecker@e29f4f6
2022-09-23 09:17:30,348 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Grabbing lock to check for database upgrade.
2022-09-23 09:17:30,368 DEBUG [c.c.u.d.VersionDaoImpl] (main:null) (logid:) Checking to see if the database is at a version before it was the version table is created
2022-09-23 09:17:30,381 DEBUG [c.c.u.SystemVmTemplateRegistration] (main:null) (logid:) Looking for file [ ./engine/schema/dist/systemvm-templates/metadata.ini ] in the classpath.
2022-09-23 09:17:30,381 DEBUG [c.c.u.SystemVmTemplateRegistration] (main:null) (logid:) Looking for file [ /usr/share/cloudstack-management/templates/systemvm/metadata.ini ] in the classpath.
2022-09-23 09:17:30,489 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) DB version = 4.17.0.1 Code Version = 4.17.1.0
2022-09-23 09:17:30,490 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Database upgrade must be performed from 4.17.0.1 to 4.17.1.0
2022-09-23 09:17:30,520 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Running upgrade NoopDbUpgrade to upgrade from 4.17.0.1-4.17.1.0 to 4.17.1.0
2022-09-23 09:17:30,880 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup upgrade NoopDbUpgrade to upgrade from 4.17.0.1-4.17.1.0 to 4.17.1.0
2022-09-23 09:17:30,900 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Upgrade completed for version 4.17.1.0
2022-09-23 09:17:30,901 INFO [o.a.c.s.l.CloudStackExtendedLifeCycle] (main:null) (logid:) Configuring CloudStack Components
2022-09-23 09:17:30,903 INFO [o.a.c.s.l.CloudStackExtendedLifeCycle] (main:null) (logid:) Done Configuring CloudStack Components
2022-09-23 09:17:30,903 INFO [o.a.c.s.m.m.i.DefaultModuleDefinitionSet] (main:null) (logid:) Loaded module context [system] in 1653 ms
|
SonarCloud Quality Gate failed. |
Codecov Report
@@ Coverage Diff @@
## 4.17 #6759 +/- ##
=========================================
Coverage 10.34% 10.34%
- Complexity 6611 6613 +2
=========================================
Files 2451 2451
Lines 242338 242339 +1
Branches 37923 37923
=========================================
+ Hits 25064 25069 +5
+ Misses 214187 214183 -4
Partials 3087 3087
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
borisstoyanov
approved these changes
Sep 23, 2022
Contributor
borisstoyanov
left a comment
borisstoyanov
left a comment
There was a problem hiding this comment.
LGTM, code reviewed
Member
Author
|
Let's merge this @shwstppr @DaanHoogland based on testing and only if you confirm this fixes upgrade to 4.17.1.1 from 4.17.0.1 |
shwstppr
approved these changes
Sep 23, 2022
Contributor
shwstppr
left a comment
shwstppr
left a comment
There was a problem hiding this comment.
LGTM. Tested upgrade
2022-09-23 11:08:57,815 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Grabbing lock to check for database upgrade.
2022-09-23 11:08:57,841 DEBUG [c.c.u.d.VersionDaoImpl] (main:null) (logid:) Checking to see if the database is at a version before it was the version table is created
2022-09-23 11:08:57,855 DEBUG [c.c.u.SystemVmTemplateRegistration] (main:null) (logid:) Looking for file [ ./engine/schema/dist/systemvm-templates/metadata.ini ] in the classpath.
2022-09-23 11:08:57,855 DEBUG [c.c.u.SystemVmTemplateRegistration] (main:null) (logid:) Looking for file [ /usr/share/cloudstack-management/templates/systemvm/metadata.ini ] in the classpath.
2022-09-23 11:08:57,903 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) DB version = 4.17.0.1 Code Version = 4.17.2.0
2022-09-23 11:08:57,903 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Database upgrade must be performed from 4.17.0.1 to 4.17.2.0
2022-09-23 11:08:57,912 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Running upgrade Upgrade41700to41710 to upgrade from 4.17.0.0-4.17.1.0 to 4.17.1.0
2022-09-23 11:08:57,914 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Licensed to the Apache Software Foundation (ASF) under one
2022-09-23 11:08:57,914 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- or more contributor license agreements. See the NOTICE file
2022-09-23 11:08:57,914 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- distributed with this work for additional information
2022-09-23 11:08:57,914 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- regarding copyright ownership. The ASF licenses this file
2022-09-23 11:08:57,914 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- to you under the Apache License, Version 2.0 (the
2022-09-23 11:08:57,914 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "License"); you may not use this file except in compliance
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- with the License. You may obtain a copy of the License at
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- http://www.apache.org/licenses/LICENSE-2.0
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Unless required by applicable law or agreed to in writing,
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- software distributed under the License is distributed on an
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- KIND, either express or implied. See the License for the
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- specific language governing permissions and limitations
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- under the License.
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Schema upgrade from 4.17.0.0 to 4.17.1.0
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) UPDATE `cloud`.`configuration` SET `value` = 'false' WHERE `name` = 'network.disable.rpfilter' AND `value` != 'true'
2022-09-23 11:08:57,915 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) UPDATE `cloud`.`configuration` SET `value` = 'false' WHERE `name` = 'consoleproxy.disable.rpfilter' AND `value` != 'true'
2022-09-23 11:08:57,916 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Retrieve the hypervisor_type from vm_instance
2022-09-23 11:08:57,916 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) DROP VIEW IF EXISTS `cloud`.`domain_router_view`
2022-09-23 11:08:57,923 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) CREATE VIEW `cloud`.`domain_router_view` AS select vm_instance.id id, vm_instance.name name, account.id account_id, account.uuid account_uuid, account.account_name account_name, account.type account_type, domain.id domain_id, domain.uuid domain_uuid, domain.name domain_name, domain.path domain_path, projects.id project_id, projects.uuid project_uuid, projects.name project_name, vm_instance.uuid uuid, vm_instance.created created, vm_instance.state state, vm_instance.removed removed, vm_instance.pod_id pod_id, vm_instance.instance_name instance_name, vm_instance.hypervisor_type, host_pod_ref.uuid pod_uuid, data_center.id data_center_id, data_center.uuid data_center_uuid, data_center.name data_center_name, data_center.networktype data_center_type, data_center.dns1 dns1, data_center.dns2 dns2, data_center.ip6_dns1 ip6_dns1, data_center.ip6_dns2 ip6_dns2, host.id host_id, host.uuid host_uuid, host.name host_name, host.cluster_id cluster_id, vm_template.id template_id, vm_template.uuid template_uuid, service_offering.id service_offering_id, service_offering.uuid service_offering_uuid, service_offering.name service_offering_name, nics.id nic_id, nics.uuid nic_uuid, nics.network_id network_id, nics.ip4_address ip_address, nics.ip6_address ip6_address, nics.ip6_gateway ip6_gateway, nics.ip6_cidr ip6_cidr, nics.default_nic is_default_nic, nics.gateway gateway, nics.netmask netmask, nics.mac_address mac_address, nics.broadcast_uri broadcast_uri, nics.isolation_uri isolation_uri, vpc.id vpc_id, vpc.uuid vpc_uuid, vpc.name vpc_name, networks.uuid network_uuid, networks.name network_name, networks.network_domain network_domain, networks.traffic_type traffic_type, networks.guest_type guest_type, async_job.id job_id, async_job.uuid job_uuid, async_job.job_status job_status, async_job.account_id job_account_id, domain_router.template_version template_version, domain_router.scripts_version scripts_version, domain_router.is_redundant_router is_redundant_router, domain_router.redundant_state redundant_state, domain_router.stop_pending stop_pending, domain_router.role role, domain_router.software_version software_version from `cloud`.`domain_router` inner join `cloud`.`vm_instance` ON vm_instance.id = domain_router.id inner join `cloud`.`account` ON vm_instance.account_id = account.id inner join `cloud`.`domain` ON vm_instance.domain_id = domain.id left join `cloud`.`host_pod_ref` ON vm_instance.pod_id = host_pod_ref.id left join `cloud`.`projects` ON projects.project_account_id = account.id left join `cloud`.`data_center` ON vm_instance.data_center_id = data_center.id left join `cloud`.`host` ON vm_instance.host_id = host.id left join `cloud`.`vm_template` ON vm_instance.vm_template_id = vm_template.id left join `cloud`.`service_offering` ON vm_instance.service_offering_id = service_offering.id left join `cloud`.`nics` ON vm_instance.id = nics.instance_id and nics.removed is null left join `cloud`.`networks` ON nics.network_id = networks.id left join `cloud`.`vpc` ON domain_router.vpc_id = vpc.id and vpc.removed is null left join `cloud`.`async_job` ON async_job.instance_id = vm_instance.id and async_job.instance_type = 'DomainRouter' and async_job.job_status = 0
2022-09-23 11:08:57,925 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size
2022-09-23 11:08:57,925 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL
2022-09-23 11:08:57,977 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup upgrade Upgrade41700to41710 to upgrade from 4.17.0.0-4.17.1.0 to 4.17.1.0
2022-09-23 11:08:57,979 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Licensed to the Apache Software Foundation (ASF) under one
2022-09-23 11:08:57,979 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- or more contributor license agreements. See the NOTICE file
2022-09-23 11:08:57,979 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- distributed with this work for additional information
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- regarding copyright ownership. The ASF licenses this file
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- to you under the Apache License, Version 2.0 (the
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "License"); you may not use this file except in compliance
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- with the License. You may obtain a copy of the License at
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- http://www.apache.org/licenses/LICENSE-2.0
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Unless required by applicable law or agreed to in writing,
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- software distributed under the License is distributed on an
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- KIND, either express or implied. See the License for the
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- specific language governing permissions and limitations
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- under the License.
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Schema upgrade cleanup from 4.17.0.0 to 4.17.1.0
2022-09-23 11:08:57,980 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) --;
2022-09-23 11:08:57,981 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup script Upgrade41700to41710 is executed successfully
2022-09-23 11:08:57,998 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Upgrade completed for version 4.17.1.0
2022-09-23 11:08:57,998 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Running upgrade NoopDbUpgrade to upgrade from 4.17.1.0-4.17.2.0 to 4.17.2.0
2022-09-23 11:08:58,003 INFO [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup upgrade NoopDbUpgrade to upgrade from 4.17.1.0-4.17.2.0 to 4.17.2.0
2022-09-23 11:08:58,008 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Upgrade completed for version 4.17.2.0
Contributor
|
Did another test. LGTM Merging based on the manual testing and LGTMs |
shwstppr
pushed a commit
to shapeblue/cloudstack
that referenced
this pull request
Sep 23, 2022
…pache#6759) Fixes DB upgrade for 4.17.0.1 to 4.17.1.0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This needs checking if it's even needed at all cc @shwstppr @DaanHoogland
Description
This PR...
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?