engine-schema: fix duplicate statements in upgrade path #11001

shwstppr · 2025-06-11T05:56:07Z

Description

Some statements to add new columns to cloud.guest_os_category have been added twice by mistake as part of #10773. These statements are idempotent and won't affect upgrade as such but better to cleanup

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?

Some statements to add new columns to cloud.guest_os_category have been added twice by mistake. These statements are idempotent and won't affect upgrade as such but better to cleanup Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr · 2025-06-11T05:56:38Z

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

 CALL `cloud`.`UPDATE_NEW_AND_DELETE_OLD_CATEGORY_FOR_GUEST_OS`('Other', 'Mac');

-- Add featured column for cloud.guest_os_category
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'featured', 'tinyint(1) NOT NULL DEFAULT 0 COMMENT "whether the category is featured or not" AFTER `uuid`');


already there at line 85

shwstppr · 2025-06-11T05:56:51Z

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

+-- Update featured for existing guest OS categories
 UPDATE `cloud`.`guest_os_category` SET featured = 1;
-- Add sort_key column for cloud.guest_os_category
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'sort_key', 'int NOT NULL DEFAULT 0 COMMENT "sort key used for customising sort method" AFTER `featured`');


already there at line 86

shwstppr · 2025-06-11T05:57:07Z

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'sort_key', 'int NOT NULL DEFAULT 0 COMMENT "sort key used for customising sort method" AFTER `featured`');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'created', 'datetime COMMENT "date on which the category was created" AFTER `sort_key`');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os_category', 'removed', 'datetime COMMENT "date removed if not null" AFTER `created`');
-UPDATE `cloud`.`guest_os_category` SET `featured` = 1 WHERE `name` NOT IN ('Novel', 'None');


added later at line 150

shwstppr · 2025-06-11T05:57:28Z

@blueorangutan package

blueorangutan · 2025-06-11T05:58:04Z

@shwstppr 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 · 2025-06-11T06:04:07Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.60%. Comparing base (bce17b6) to head (47d5863).
Report is 22 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##               main   #11001   +/-   ##
=========================================
  Coverage     16.60%   16.60%           
  Complexity    13925    13925           
=========================================
  Files          5729     5729           
  Lines        508070   508070           
  Branches      61769    61769           
=========================================
+ Hits          84370    84385   +15     
+ Misses       414271   414250   -21     
- Partials       9429     9435    +6

Flag	Coverage Δ
uitests	`3.93% <ø> (ø)`
unittests	`17.50% <ø> (+<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 · 2025-06-11T07:08:41Z

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

weizhouapache

code lgtm

not tested

harikrishna-patnala

LGTM

shwstppr · 2025-06-11T09:26:32Z

@blueorangutan test

blueorangutan · 2025-06-11T09:28:04Z

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

blueorangutan · 2025-06-11T10:15:09Z

[SF] Trillian Build Failed (tid-13495)

Pearl1594 · 2025-06-11T11:39:18Z

@blueorangutan test

blueorangutan · 2025-06-11T11:40:03Z

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

blueorangutan · 2025-06-12T05:12:22Z

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

Test	Result	Time (s)	Test File

boring-cyborg · 2025-06-12T06:05:40Z

Awesome work, congrats on your first merged pull request!

Some statements to add new columns to cloud.guest_os_category have been added twice by mistake as part of apache#10773. These statements are idempotent and won't affect upgrade as such but better to cleanup Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr commented Jun 11, 2025

View reviewed changes

weizhouapache approved these changes Jun 11, 2025

View reviewed changes

harikrishna-patnala approved these changes Jun 11, 2025

View reviewed changes

shwstppr added this to the 4.21.0 milestone Jun 11, 2025

Pearl1594 approved these changes Jun 11, 2025

View reviewed changes

shwstppr merged commit 2d669db into apache:main Jun 12, 2025
21 of 25 checks passed

shwstppr deleted the cleanup-10773-upgrade-path branch June 12, 2025 06:04

sureshanaparti added this to Apache CloudStack 4.21.0 Jul 14, 2025

sureshanaparti moved this to Done in Apache CloudStack 4.21.0 Jul 14, 2025

engine-schema: fix duplicate statements in upgrade path #11001

engine-schema: fix duplicate statements in upgrade path #11001

Uh oh!

Conversation

shwstppr commented Jun 11, 2025 • 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!

shwstppr Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

shwstppr Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

shwstppr Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

shwstppr commented Jun 11, 2025

Uh oh!

blueorangutan commented Jun 11, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Jun 11, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

shwstppr commented Jun 11, 2025

Uh oh!

blueorangutan commented Jun 11, 2025

Uh oh!

blueorangutan commented Jun 11, 2025

Uh oh!

Pearl1594 commented Jun 11, 2025

Uh oh!

blueorangutan commented Jun 11, 2025

Uh oh!

blueorangutan commented Jun 12, 2025

Uh oh!

Uh oh!

boring-cyborg bot commented Jun 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

shwstppr commented Jun 11, 2025 •

edited

Loading

codecov bot commented Jun 11, 2025 •

edited

Loading