schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 #11469

weizhouapache · 2025-08-19T09:21:36Z

Description

This PR...

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

Screenshots (if appropriate):

How Has This Been Tested?

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

codecov · 2025-08-19T09:29:49Z

Codecov Report

❌ Patch coverage is 12.19512% with 36 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.36%. Comparing base (f2d6356) to head (98e6dc5).
⚠️ Report is 18 commits behind head on main.

Files with missing lines	Patch %	Lines
...src/main/java/com/cloud/upgrade/dao/DbUpgrade.java	0.00%	23 Missing ⚠️
...m/cloud/upgrade/dao/DbUpgradeSystemVmTemplate.java	0.00%	10 Missing ⚠️
...ava/com/cloud/upgrade/dao/Upgrade42100to42200.java	57.14%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               main   #11469   +/-   ##
=========================================
  Coverage     17.35%   17.36%           
- Complexity    15230    15236    +6     
=========================================
  Files          5886     5888    +2     
  Lines        525685   525722   +37     
  Branches      64159    64161    +2     
=========================================
+ Hits          91247    91266   +19     
- Misses       424138   424157   +19     
+ Partials      10300    10299    -1

Flag	Coverage Δ
uitests	`3.63% <ø> (+<0.01%)`	⬆️
unittests	`18.39% <12.19%> (+<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.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

engine/schema/src/main/resources/META-INF/db/schema-42100to42200-cleanup.sql

engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql

…00-cleanup.sql

…00.sql

weizhouapache · 2025-08-19T09:45:26Z

@blueorangutan package

blueorangutan · 2025-08-19T09:46:04Z

@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 · 2025-08-19T11:19:47Z

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

weizhouapache · 2025-08-19T11:28:21Z

@blueorangutan test

blueorangutan · 2025-08-19T11:30:03Z

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

Copilot

Pull Request Overview

This PR adds the database upgrade path from Apache CloudStack version 4.21.0.0 to 4.22.0.0. The implementation follows the standard CloudStack upgrade pattern by providing the necessary infrastructure for schema migration.

Creates empty SQL migration scripts for the version upgrade
Implements the Java upgrade class with standard boilerplate methods
Registers the new upgrade path in the DatabaseUpgradeChecker chain

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

File	Description
`schema-42100to42200.sql`	Empty SQL migration script with Apache license header
`schema-42100to42200-cleanup.sql`	Empty SQL cleanup script with Apache license header
`Upgrade42100to42200.java`	Java upgrade implementation with standard methods and system VM template registration
`DatabaseUpgradeChecker.java`	Registration of the new upgrade path in the upgrade chain

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.}

Copilot · 2025-08-19T12:15:53Z

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42100to42200.java

+    }
+
+    private void initSystemVmTemplateRegistration() {
+        systemVmTemplateRegistration = new SystemVmTemplateRegistration("");


The SystemVmTemplateRegistration constructor is being called with an empty string parameter. This may indicate missing configuration or could lead to unexpected behavior. Consider providing the appropriate parameter value or documenting why an empty string is intentional.

Suggested change

systemVmTemplateRegistration = new SystemVmTemplateRegistration("");

// TODO: Replace "systemVmTemplateConfig" with the actual required configuration value.

systemVmTemplateRegistration = new SystemVmTemplateRegistration("systemVmTemplateConfig");

// If an empty string is intentional, document the reason here.

harikrishna-patnala

thanks @weizhouapache LGTM

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42100to42200.java

weizhouapache · 2025-08-28T11:21:46Z

made some changes as suggested by @sureshanaparti

@blueorangutan package

blueorangutan · 2025-08-28T11:24:03Z

@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 · 2025-08-28T12:36:28Z

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

weizhouapache · 2025-08-28T12:40:48Z

@blueorangutan test keepEnv

blueorangutan · 2025-08-28T12:42:04Z

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

sureshanaparti

lgtm

blueorangutan · 2025-08-29T22:23:07Z

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

Test	Result	Time (s)	Test File

* Add upgrade path from 4.21.0.0 to 4.22.0.0 * Optimize DbUpgrade files

schema: Add upgrade path from 4.21.0.0 to 4.22.0.0

d145884

weizhouapache mentioned this pull request Aug 19, 2025

Update md5sum to sha512sum #11134

Merged

14 tasks

weizhouapache added this to the 4.22.0 milestone Aug 19, 2025

weizhouapache commented Aug 19, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-42100to42200-cleanup.sql Outdated Show resolved Hide resolved

engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql Outdated Show resolved Hide resolved

weizhouapache added 2 commits August 19, 2025 11:30

Update engine/schema/src/main/resources/META-INF/db/schema-42100to422…

cc8d9b2

…00-cleanup.sql

Update engine/schema/src/main/resources/META-INF/db/schema-42100to422…

01b1460

…00.sql

sureshanaparti requested review from Copilot and DaanHoogland August 19, 2025 12:15

Copilot AI reviewed Aug 19, 2025

View reviewed changes

rohityadavcloud approved these changes Aug 20, 2025

View reviewed changes

harikrishna-patnala approved these changes Aug 20, 2025

View reviewed changes

sureshanaparti reviewed Aug 22, 2025

View reviewed changes

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42100to42200.java Outdated Show resolved Hide resolved

sureshanaparti reviewed Aug 22, 2025

View reviewed changes

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42100to42200.java Outdated Show resolved Hide resolved

Optimize DbUpgrade files

98e6dc5

weizhouapache marked this pull request as ready for review August 28, 2025 11:22

sureshanaparti approved these changes Aug 28, 2025

View reviewed changes

DaanHoogland approved these changes Aug 29, 2025

View reviewed changes

DaanHoogland added status:waiting-for-smoketest-results component:upgrade labels Aug 29, 2025

shwstppr approved these changes Aug 30, 2025

View reviewed changes

shwstppr removed the status:waiting-for-smoketest-results label Aug 30, 2025

shwstppr merged commit 889fc62 into apache:main Aug 30, 2025
25 of 26 checks passed

DaanHoogland deleted the 4.22-add-upgrade-path branch September 1, 2025 15:14

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Sep 4, 2025

schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 (apache#11469)

eec0b39

* Add upgrade path from 4.21.0.0 to 4.22.0.0 * Optimize DbUpgrade files

-        systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
+        // TODO: Replace "systemVmTemplateConfig" with the actual required configuration value.
+        systemVmTemplateRegistration = new SystemVmTemplateRegistration("systemVmTemplateConfig");
+        // If an empty string is intentional, document the reason here.

schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 #11469

schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 #11469

Uh oh!

Conversation

weizhouapache commented Aug 19, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

codecov bot commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Aug 19, 2025

Uh oh!

blueorangutan commented Aug 19, 2025

Uh oh!

blueorangutan commented Aug 19, 2025

Uh oh!

weizhouapache commented Aug 19, 2025

Uh oh!

blueorangutan commented Aug 19, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Aug 28, 2025

Uh oh!

blueorangutan commented Aug 28, 2025

Uh oh!

blueorangutan commented Aug 28, 2025

Uh oh!

weizhouapache commented Aug 28, 2025

Uh oh!

blueorangutan commented Aug 28, 2025

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Aug 29, 2025

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Aug 19, 2025 •

edited

Loading