Fix Backup related upgrade failure from 4.20.1/4.20.2 to 4.21.0/4.22.0 by abh1sar · Pull Request #12777 · apache/cloudstack

abh1sar · 2026-03-10T05:23:00Z

Description

This PR fixes#12769

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?

Created 4 data volumes on 4.20.
Took a backup
Upgrade to 4.22

Also tried running the new query manually on backed-up volumes containing data of 24 volumes.

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

…as cut by GROUP_CONCAT

abh1sar · 2026-03-10T05:23:26Z

@blueorangutan package

blueorangutan · 2026-03-10T05:24:04Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

codecov · 2026-03-10T05:31:30Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.92%. Comparing base (5caf6cd) to head (fdc1e5f).
⚠️ Report is 49 commits behind head on 4.22.

Additional details and impacted files

@@ Coverage Diff @@## 4.22 #12777 +/- ##
============================================
+ Coverage 17.60% 17.92% +0.31% - Complexity 15659 16179 +520 
============================================
Files 5917 5949 +32 Lines 531394 534058 +2664 Branches 64970 65301 +331 ============================================
+ Hits 93575 95752 +2177 - Misses 427269 427550 +281 - Partials 10550 10756 +206

Flag	Coverage Δ
uitests	`3.66% <ø> (-0.04%)`	⬇️
unittests	`19.03% <ø> (+0.35%)`	⬆️

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-10T06:11:38Z

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

abh1sar · 2026-03-10T07:12:48Z

@blueorangutan package

blueorangutan · 2026-03-10T07:14: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-10T08:23:11Z

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

Copilot

Pull request overview

This PR addresses an upgrade-time failure in the 4.20.1/4.20.2 → 4.21.0/4.22.0 database migration when the backup framework is in use, by eliminating reliance on GROUP_CONCAT() string-building that can exceed group_concat_max_len.

Changes:

Replaces manual JSON string concatenation using GROUP_CONCAT() with JSON_ARRAYAGG(JSON_OBJECT(...)) when backfilling backed_volumes in cloud.backups.
Applies the same change when backfilling backup_volumes in cloud.vm_instance, defaulting to '[]' for VMs with no volumes.

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

sureshanaparti

code lgtm

abh1sar · 2026-04-07T05:26:00Z

@sureshanaparti @vladimirpetrov
This is a must have for 4.22.1. Thanks

DaanHoogland · 2026-04-09T08:46:08Z

@blueorangutan package

blueorangutan · 2026-04-09T08:48:04Z

@DaanHoogland 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-04-09T09:48:08Z

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

rajujith

LGTM
Tested upgrade from 4.20.2 to this PR
VMs had 3 volumes and backups on NAS repo

DaanHoogland · 2026-04-09T13:13:07Z

@blueorangutan test

blueorangutan · 2026-04-09T13:14:05Z

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

blueorangutan · 2026-04-10T04:02:13Z

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

Test	Result	Time (s)	Test File

replace GROUP_CONCAT with JSON_ARRAYAGG to avoid errors like Row 19 w…
fdc1e5f
…as cut by GROUP_CONCAT

abh1sar changed the base branch from main to 4.22March 10, 2026 06:59

abh1sar marked this pull request as ready for review March 10, 2026 11:33

abh1sar requested review from shwstppr and sureshanaparti March 10, 2026 11:33

shwstppr requested a review from Copilot March 26, 2026 11:28

Copilotstarted reviewing on behalf of shwstppr March 26, 2026 11:29 View session

CopilotAI reviewed Mar 26, 2026
View reviewed changes

sureshanaparti added this to the 4.22.1 milestone Apr 1, 2026

sureshanaparti added this to Apache CloudStack 4.22.1 Apr 1, 2026

github-project-automationBot moved this to Todo in Apache CloudStack 4.22.1 Apr 1, 2026

sureshanaparti moved this from Todo to In Progress in Apache CloudStack 4.22.1 Apr 1, 2026

sureshanaparti approved these changes Apr 1, 2026
View reviewed changes

sureshanaparti added status:needs-testing ready-for-testing labels Apr 1, 2026

DaanHoogland assigned vladimirpetrov Apr 2, 2026

abh1sar added the Severity:BLOCKER label Apr 7, 2026

rajujith approved these changes Apr 9, 2026
View reviewed changes

sureshanaparti merged commit 4ba4bd3 into apache:4.22Apr 10, 2026
25 of 32 checks passed

github-project-automationBot moved this from In Progress to Done in Apache CloudStack 4.22.1 Apr 10, 2026

sureshanaparti deleted the backup-upgrade branch April 10, 2026 04:09

sureshanaparti mentioned this pull request Apr 10, 2026
Backup related upgrade failure from 4.20.1/4.20.2 to 4.21.0/4.22.0 #12769
Closed

Uh oh!

Conversation

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

Uh oh!

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!

abh1sar commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

abh1sar commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

abh1sar commented Apr 7, 2026

Uh oh!

DaanHoogland commented Apr 9, 2026

Uh oh!

blueorangutan commented Apr 9, 2026

Uh oh!

blueorangutan commented Apr 9, 2026

Uh oh!

rajujith left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Apr 9, 2026

Uh oh!

blueorangutan commented Apr 9, 2026

Uh oh!

blueorangutan commented Apr 10, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

abh1sar commented Mar 10, 2026•
edited
Loading

codecovBot commented Mar 10, 2026•
edited
Loading