Skip to content

upgrade: skip the upgrade paths which are not needed#12881

Draft
weizhouapache wants to merge 2 commits intoapache:4.20from
weizhouapache:4.20-fix-upgrade-from-4201-to-4203
Draft

upgrade: skip the upgrade paths which are not needed#12881
weizhouapache wants to merge 2 commits intoapache:4.20from
weizhouapache:4.20-fix-upgrade-from-4201-to-4203

Conversation

@weizhouapache
Copy link
Member

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

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

@codecov
Copy link

codecov bot commented Mar 24, 2026

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
Copy link

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

@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

Copy link
Contributor

@abh1sar abh1sar left a comment

Choose a reason for hiding this comment

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

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

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
Copy link

[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

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.

3 participants