Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Dec 4, 2024

Conversation

weizhouapache
Copy link
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
Member Author

@blueorangutan package

@blueorangutan
Copy link

@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.

Copy link

codecov bot commented Dec 2, 2024

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     
Flag Coverage Δ
uitests 4.02% <ø> (ø)
unittests 16.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.

Copy link
Contributor

@harikrishna-patnala harikrishna-patnala left a comment

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.

Copy link
Contributor

@shwstppr shwstppr left a comment

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

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

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

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

@weizhouapache
Copy link
Member Author

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 |

Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

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

clgtm

Copy link
Collaborator

@bernardodemarco bernardodemarco left a comment

Choose a reason for hiding this comment

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

CLGTM

@rohityadavcloud rohityadavcloud added this to the 4.20.1 milestone Dec 2, 2024
@rohityadavcloud rohityadavcloud marked this pull request as ready for review December 2, 2024 17:36
@blueorangutan
Copy link

[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:

Test Result Time (s) Test File
test_08_arping_in_ssvm Failure 5.21 test_diagnostics.py

@rohityadavcloud
Copy link
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
Member Author

@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
Member Author

@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

@weizhouapache weizhouapache reopened this Dec 3, 2024
@weizhouapache weizhouapache changed the title engine/schema: Add 4.20.0 to 4.20.1 upgrade path engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade Dec 3, 2024
@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@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

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

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

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

@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@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

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

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

[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:

Test Result Time (s) Test File

@DaanHoogland DaanHoogland merged commit b3dc402 into apache:4.20 Dec 4, 2024
26 checks passed
@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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants