Fix Backup related upgrade failure from 4.20.1/4.20.2 to 4.21.0/4.22.0#12777
Fix Backup related upgrade failure from 4.20.1/4.20.2 to 4.21.0/4.22.0#12777abh1sar wants to merge 1 commit intoapache:4.22from
Conversation
…as cut by GROUP_CONCAT
|
@blueorangutan package |
|
@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 Report✅ All modified and coverable lines are covered by tests. 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
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17059 |
|
@blueorangutan package |
|
@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. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17061 |
There was a problem hiding this comment.
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()withJSON_ARRAYAGG(JSON_OBJECT(...))when backfillingbacked_volumesincloud.backups. - Applies the same change when backfilling
backup_volumesincloud.vm_instance, defaulting to'[]'for VMs with no volumes.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Description
This PR fixes #12769
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
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?