Skip to content

[Usage] Include accounts uuid on the cloud_usage accounts initial saving#12420

Merged
nvazquez merged 1 commit intoapache:4.20from
shapeblue:420-usage-accounts-uuid
Jan 15, 2026
Merged

[Usage] Include accounts uuid on the cloud_usage accounts initial saving#12420
nvazquez merged 1 commit intoapache:4.20from
shapeblue:420-usage-accounts-uuid

Conversation

@nvazquez
Copy link
Copy Markdown
Contributor

@nvazquez nvazquez commented Jan 14, 2026 •
edited
Loading

Description

This PR adds the uuid value from the cloud accounts into the cloud_usage accounts table as part of the saving of new accounts on the cloud_usage schema.

Fixes: #11077

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?

@nvazquez nvazquez added this to the 4.20.3 milestone Jan 14, 2026
@nvazquez nvazquez mentioned this pull request Jan 14, 2026
Closed
@nvazquez nvazquez linked an issue Jan 14, 2026 that may be closed by this pull request
NULL value in uuid column of cloud_usage.account table #11077
Closed
@nvazquez
Copy link
Copy Markdown
Contributor Author

nvazquez commented Jan 14, 2026

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jan 14, 2026

@nvazquez 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
Copy Markdown

codecov bot commented Jan 14, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 0% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.23%. Comparing base (6a324da) to head (f8f1be0).
⚠️ Report is 2 commits behind head on 4.20.

Files with missing lines Patch % Lines
...rc/main/java/com/cloud/usage/dao/UsageDaoImpl.java 0.00% 8 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff            @@
##               4.20   #12420   +/-   ##
=========================================
  Coverage     16.23%   16.23%           
+ Complexity    13382    13379    -3     
=========================================
  Files          5657     5657           
  Lines        498999   499000    +1     
  Branches      60566    60566           
=========================================
+ Hits          81035    81036    +1     
- Misses       408928   408929    +1     
+ Partials       9036     9035    -1
Flag Coverage Δ
uitests 4.03% <ø> (ø)
unittests 17.09% <0.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.

@nvazquez nvazquez marked this pull request as draft January 14, 2026 05:27
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jan 14, 2026

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

DaanHoogland
DaanHoogland approved these changes Jan 14, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

@DaanHoogland
Copy link
Copy Markdown
Contributor

DaanHoogland commented Jan 14, 2026

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jan 14, 2026

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

vishesh92
vishesh92 approved these changes Jan 14, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@vishesh92 vishesh92 left a comment

Choose a reason for hiding this comment

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

clgtm

RosiKyu
RosiKyu approved these changes Jan 14, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@RosiKyu RosiKyu left a comment

Choose a reason for hiding this comment

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

LGTM

  1. Verified cloud_usage.account table was empty initially
  2. Confirmed cloud.account table had 4 accounts with valid UUIDs
  3. Triggered usage job by updating usage.stats.job.exec.time and restarting cloudstack-usage service
  4. Checked cloud_usage.account table after usage job completed

Test Results:

All UUIDs correctly copied from source to destination.

Source table (cloud.account):

+----+--------------------------+--------------------------------------+
| id | account_name             | uuid                                 |
+----+--------------------------+--------------------------------------+
|  1 | system                   | e41fce8c-f14a-11f0-baeb-1e0015000cb4 |
|  2 | admin                    | e41ffe26-f14a-11f0-baeb-1e0015000cb4 |
|  3 | baremetal-system-account | a9508fa4-3506-435f-b498-b24f9cad6aa5 |
|  4 | ACSUser                  | 7c139ee2-6407-416d-af8a-3df8bcca3ec3 |
+----+--------------------------+--------------------------------------+

Destination table (cloud_usage.account) after usage job:

+----+--------------------------+--------------------------------------+
| id | account_name             | uuid                                 |
+----+--------------------------+--------------------------------------+
|  1 | system                   | e41fce8c-f14a-11f0-baeb-1e0015000cb4 |
|  2 | admin                    | e41ffe26-f14a-11f0-baeb-1e0015000cb4 |
|  3 | baremetal-system-account | a9508fa4-3506-435f-b498-b24f9cad6aa5 |
|  4 | ACSUser                  | 7c139ee2-6407-416d-af8a-3df8bcca3ec3 |
+----+--------------------------+--------------------------------------+

@apache apache deleted a comment from blueorangutan Jan 14, 2026
@DaanHoogland DaanHoogland marked this pull request as ready for review January 14, 2026 16:01
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jan 14, 2026

[SF] Trillian Build Failed (tid-15183)

@nvazquez
Copy link
Copy Markdown
Contributor Author

nvazquez commented Jan 14, 2026

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jan 14, 2026

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

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jan 15, 2026

[SF] Trillian test result (tid-15184)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51895 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12420-t15184-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

@nvazquez
Copy link
Copy Markdown
Contributor Author

nvazquez commented Jan 15, 2026 •
edited
Loading

Thanks @DaanHoogland @vishesh92 @RosiKyu, merging

@nvazquez nvazquez merged commit aba3285 into apache:4.20 Jan 15, 2026
23 of 25 checks passed
@nvazquez nvazquez deleted the 420-usage-accounts-uuid branch January 15, 2026 09:50
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jan 21, 2026
@nvazquez @dhslove
[Usage] Include accounts uuid on the cloud_usage accounts initial sav…
8592426 
…ing (apache#12420)
sandeeplocharla pushed a commit to NetApp/cloudstack that referenced this pull request Feb 6, 2026
@nvazquez
[Usage] Include accounts uuid on the cloud_usage accounts initial sav…
9547547 
…ing (apache#12420)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@vishesh92 vishesh92 vishesh92 approved these changes

@RosiKyu RosiKyu RosiKyu approved these changes

@shwstppr shwstppr Awaiting requested review from shwstppr

@kiranchavala kiranchavala Awaiting requested review from kiranchavala

@weizhouapache weizhouapache Awaiting requested review from weizhouapache

@abh1sar abh1sar Awaiting requested review from abh1sar

Assignees

No one assigned

Labels

component:usage-server status:waiting-for-smoketest-results type:enhancement

Projects

None yet

Milestone

4.20.3

Development

Successfully merging this pull request may close these issues.

NULL value in uuid column of cloud_usage.account table

5 participants

@nvazquez @blueorangutan @DaanHoogland @vishesh92 @RosiKyu