Skip to content

engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade - #10018

Merged
DaanHoogland merged 3 commits into
apache:4.20from
weizhouapache:4.20.1-upgrade-path
Dec 4, 2024
Merged

engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade#10018
DaanHoogland merged 3 commits into
apache:4.20from
weizhouapache:4.20.1-upgrade-path

Conversation

@weizhouapache

Copy link
Copy Markdown
Member

Description

This PR

  • adds the upgrade path for 4.20.1
  • move some new SQLs from 4.19.1->4.20.0 to 4.20.0->4.20.1

Types of changes

  • 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)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@codecov

codecovBot commented Dec 2, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.01%. Comparing base (52e7b41) to head (48467e6).
Report is 11 commits behind head on 4.20.

Additional details and impacted files
@@ Coverage Diff @@## 4.20 #10018 +/- ##
============================================
- Coverage 16.01% 16.01% -0.01% 
Complexity 12777 12777 ============================================
Files 5633 5633 Lines 492990 492990 Branches 59772 59772 ============================================
- Hits 78967 78966 -1 
Misses 405257 405257 - Partials 8766 8767 +1 
FlagCoverage Δ
uitests4.02% <ø> (ø)
unittests16.85% <ø> (-0.01%)⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@harikrishna-patnalaharikrishna-patnala left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code LGTM.

Just to mention #9885 these sql changes are moved to new file.

@shwstpprshwstppr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code lgtm

@blueorangutan

Copy link
Copy Markdown

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11677

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

double-checked the database, looks ok

mysql> select * from version;
...
| 45 | 4.20.0.0 | 2024-12-02 10:04:53 | Complete |
| 46 | 4.20.1.0 | 2024-12-02 10:04:53 | Complete |
+----+----------+---------------------+----------+
mysql> show create table mshost_peer;
...
| mshost_peer | CREATE TABLE `mshost_peer` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`owner_mshost` bigint unsigned NOT NULL,
`peer_mshost` bigint unsigned NOT NULL,
`peer_runid` bigint NOT NULL,
`peer_state` varchar(10) NOT NULL DEFAULT 'Down',
`last_update` datetime DEFAULT NULL COMMENT 'Last record update time',
PRIMARY KEY (`id`),
UNIQUE KEY `i_mshost_peer__owner_peer` (`owner_mshost`,`peer_mshost`),
KEY `fk_mshost_peer__peer_mshost` (`peer_mshost`),
CONSTRAINT `fk_mshost_peer__owner_mshost` FOREIGN KEY (`owner_mshost`) REFERENCES `mshost` (`id`) ON DELETE CASCADE,
CONSTRAINT `fk_mshost_peer__peer_mshost` FOREIGN KEY (`peer_mshost`) REFERENCES `mshost` (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 |

@sureshanapartisureshanaparti left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

@bernardodemarcobernardodemarco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CLGTM

@yadvryadvr added this to the 4.20.1 milestone Dec 2, 2024
@yadvr
yadvr marked this pull request as ready for review December 2, 2024 17:36
Comment threadengine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java Outdated
@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-11832)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 57111 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10018-t11832-kvm-ol8.zip
Smoke tests completed. 140 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

TestResultTime (s)Test File
test_08_arping_in_ssvmFailure5.21test_diagnostics.py

@yadvr

yadvr commented Dec 3, 2024

Copy link
Copy Markdown
Member

@weizhouapache my bad, looks like I merged d17de83 which already created an upgrade path. Please check and close or fix conflicts on this PR.

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@weizhouapache my bad, looks like I merged d17de83 which already created an upgrade path. Please check and close or fix conflicts on this PR.

@rohityadavcloud
it is fine, no worries, closing this PR

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@weizhouapache my bad, looks like I merged d17de83 which already created an upgrade path. Please check and close or fix conflicts on this PR.

@rohityadavcloud it is fine, no worries, closing this PR

oh, my bad, we need to move some SQLs as well

@weizhouapacheweizhouapache changed the title engine/schema: Add 4.20.0 to 4.20.1 upgrade pathengine/schema: move SQLs to 4.20.0 to 4.20.1 upgradeDec 3, 2024
@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11687

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11689

@weizhouapache

Copy link
Copy Markdown
MemberAuthor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-11836)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 52235 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10018-t11836-kvm-ol8.zip
Smoke tests completed. 141 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

TestResultTime (s)Test File

@DaanHoogland
DaanHoogland merged commit b3dc402 into apache:4.20Dec 4, 2024
@DaanHoogland
DaanHoogland deleted the 4.20.1-upgrade-path branch December 4, 2024 07:11
DaanHoogland added a commit that referenced this pull request Dec 4, 2024
* 4.20:
UI: Fix userdata and load balancer selection (#10016)
Prevent password updates for SAML and LDAP users (#9999)
cloudstack-migrate-databases: sql AND added (#10033)
engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade (#10018)
Remove user from project before deletion (#10008)
Simplify validation for creating volume templates via UI (#9828)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Dec 12, 2024
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Dec 12, 2024
* 4.20:
UI: Fix userdata and load balancer selection (apache#10016)
Prevent password updates for SAML and LDAP users (apache#9999)
cloudstack-migrate-databases: sql AND added (apache#10033)
engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade (apache#10018)
Remove user from project before deletion (apache#10008)
Simplify validation for creating volume templates via UI (apache#9828)
@Pearl1594Pearl1594 moved this to Done in ACS 4.20.1Mar 17, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

9 participants

@weizhouapache@blueorangutan@yadvr@shwstppr@harikrishna-patnala@sureshanaparti@bernardodemarco@DaanHoogland@Pearl1594