upgrade: skip the upgrade paths which are not needed by weizhouapache · Pull Request #12881 · apache/cloudstack

weizhouapache · 2026-03-24T11:43:29Z

Description

This PR provides an alternative solution as #12875

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?

weizhouapache · 2026-03-24T11:44:45Z

@blueorangutan package

blueorangutan · 2026-03-24T11: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.

codecov · 2026-03-24T11:51:25Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 16.25%. Comparing base (c19630f) to head (af63725).

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #12881   +/-   ##
=========================================
  Coverage     16.25%   16.25%           
+ Complexity    13415    13413    -2     
=========================================
  Files          5664     5664           
  Lines        500465   500467    +2     
  Branches      60780    60780           
=========================================
+ Hits          81338    81341    +3     
+ Misses       410031   410030    -1     
  Partials       9096     9096

Flag	Coverage Δ
uitests	`4.15% <ø> (ø)`
unittests	`17.10% <100.00%> (+<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.

blueorangutan · 2026-03-24T12:41:29Z

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

weizhouapache · 2026-03-24T12:57:30Z

@blueorangutan test

blueorangutan · 2026-03-24T12:58:03Z

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

abh1sar

Thanks @weizhouapache. Looks good.
It's better to fix this logic rather than adding an upgrade path which does nothing.

Do you think we should still make sure that all the queries in the upgrade path are idempotent?

INSERT IGNORE INTO cloud.configuration_group (name, description, precedence) VALUES ('Usage Server', 'Usage Server related configuration', 9);

from https://github.com/apache/cloudstack/pull/12875/changes

weizhouapache · 2026-03-24T14:02:40Z

Thanks @weizhouapache. Looks good. It's better to fix this logic rather than adding an upgrade path which does nothing.

Do you think we should still make sure that all the queries in the upgrade path are idempotent?

INSERT IGNORE INTO cloud.configuration_group (name, description, precedence) VALUES ('Usage Server', 'Usage Server related configuration', 9);

from https://github.com/apache/cloudstack/pull/12875/changes

yes @abh1sar
it is better to apply the change, let me add it

blueorangutan · 2026-03-25T04:55:56Z

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

Test	Result	Time (s)	Test File
test_01_migrate_vm_strict_tags_success	`Error`	8.81	test_vm_strict_host_tags.py
test_02_migrate_vm_strict_tags_failure	`Error`	3.62	test_vm_strict_host_tags.py
test_01_restore_vm_strict_tags_success	`Error`	5.71	test_vm_strict_host_tags.py
test_02_restore_vm_strict_tags_failure	`Error`	3.64	test_vm_strict_host_tags.py
test_01_scale_vm_strict_tags_success	`Error`	5.78	test_vm_strict_host_tags.py
test_02_scale_vm_strict_tags_failure	`Error`	3.70	test_vm_strict_host_tags.py
test_01_deploy_vm_on_specific_host_without_strict_tags	`Error`	3.65	test_vm_strict_host_tags.py
test_02_deploy_vm_on_any_host_without_strict_tags	`Error`	9.80	test_vm_strict_host_tags.py
test_03_deploy_vm_on_specific_host_with_strict_tags_success	`Error`	10.90	test_vm_strict_host_tags.py
test_04_deploy_vm_on_any_host_with_strict_tags_success	`Error`	7.06	test_vm_strict_host_tags.py
test_01_cancel_host_maintenace_with_no_migration_jobs	`Error`	7.35	test_host_maintenance.py
test_02_cancel_host_maintenace_with_migration_jobs	`Error`	138.71	test_host_maintenance.py
test_03_cancel_host_maintenace_with_migration_jobs_failure	`Error`	93.03	test_host_maintenance.py
test_01_cancel_host_maintenance_ssh_enabled_agent_connected	`Failure`	1.15	test_host_maintenance.py
test_03_cancel_host_maintenance_ssh_disabled_agent_connected	`Failure`	1.16	test_host_maintenance.py
test_04_cancel_host_maintenance_ssh_disabled_agent_disconnected	`Failure`	1.14	test_host_maintenance.py

Copilot

Pull request overview

This PR adjusts CloudStack’s DB upgrade-path calculation so that when the current DB version is not explicitly present in the upgrade hierarchy, already-applied upgrade steps are skipped, avoiding re-running migrations that can fail on duplicate data.

Changes:

Update DatabaseVersionHierarchy#getPath to filter out upgrade steps whose getUpgradedVersion() is not greater than the actual DB version when the DB version is missing from the hierarchy.
Add a unit test to validate the computed upgrade path for 4.20.1.0 -> 4.20.3.0 (expecting only Upgrade42020to42030).
Make the Usage Server configuration group insertion idempotent in schema-42000to42010.sql by switching to INSERT IGNORE.

Reviewed changes

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

File	Description
engine/schema/src/main/java/com/cloud/upgrade/DatabaseVersionHierarchy.java	Filters upgrade steps when the “from” version isn’t in the hierarchy to avoid re-running already-applied migrations.
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java	Adds coverage for the specific `4.20.1.0 -> 4.20.3.0` upgrade-path scenario.
engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql	Makes the configuration group insert resilient to duplicate-key conditions.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql

abh1sar

Code LGTM

abh1sar · 2026-03-25T05:37:34Z

@blueorangutan package

blueorangutan · 2026-03-25T05:38:04Z

@abh1sar 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 · 2026-03-25T06:32:18Z

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

weizhouapache · 2026-03-25T08:50:00Z

@blueorangutan test

blueorangutan · 2026-03-25T08:52:03Z

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

RosiKyu

LGTM

Looks great, thanks @weizhouapache !

upgrade: skip the upgrade paths which are not needed

ea89141

weizhouapache mentioned this pull request Mar 24, 2026

engine/schema: fix missing 4.20.1.0 node in DB upgrade hierarchy #12875

Open

14 tasks

abh1sar reviewed Mar 24, 2026

View reviewed changes

Copy Rosi's change in schema-42000to42010.sql

af63725

abh1sar added the status:needs-testing label Mar 25, 2026

abh1sar added this to the 4.20.3 milestone Mar 25, 2026

abh1sar requested a review from Copilot March 25, 2026 05:00

Copilot started reviewing on behalf of abh1sar March 25, 2026 05:00 View session

Copilot AI reviewed Mar 25, 2026

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql Show resolved Hide resolved

abh1sar approved these changes Mar 25, 2026

View reviewed changes

abh1sar added the ready-for-testing label Mar 25, 2026

RosiKyu approved these changes Mar 25, 2026

View reviewed changes

weizhouapache marked this pull request as ready for review March 25, 2026 16:16

Conversation

weizhouapache commented Mar 24, 2026

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!

weizhouapache commented Mar 24, 2026

Uh oh!

blueorangutan commented Mar 24, 2026

Uh oh!

codecov bot commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Mar 24, 2026

Uh oh!

weizhouapache commented Mar 24, 2026

Uh oh!

blueorangutan commented Mar 24, 2026

Uh oh!

abh1sar left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Mar 24, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

abh1sar left a comment

Choose a reason for hiding this comment

Uh oh!

abh1sar commented Mar 25, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

weizhouapache commented Mar 25, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

RosiKyu left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Mar 24, 2026 •

edited

Loading