Add missing project cleanups while deleting/moving user by winterhazel · Pull Request #13817 · apache/cloudstack

winterhazel · 2026-08-06T12:17:10Z

Description

This PR adds missing project_account and project_invitation cleanups while deleting/moving a user. Some of these changes were missing on the merge-forward of #10008.

Closes #13796.

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

DB upgrade

Upgrade 4.22.1 -> 4.23.0 with existing stale project_account + project_invitations: stale rows purged.

User cleanup

Delete user who's a member of 2 projects: project_account rows removed.
Delete user with pending project invitations: project_invitations rows removed.
Delete user who's a Project Admin: project resource count on their account decremented by 1.
Delete user with no project memberships: still succeeds.

Remove user from a project

Remove regular user: association removed.
Remove Project Admin user: association removed and project count decremented.

Move user

Move regular user to another account: project_account + project_invitations rows now point to the new user+account.
Move Project Admin user to another account: new account's project count incremented, old account's decremented.
Move Project Admin user across accounts when target account is at its project limit: ResourceAllocationException + full rollback.

winterhazel · 2026-08-06T12:18:53Z

@blueorangutan package

blueorangutan · 2026-08-06T12:20:05Z

@winterhazel 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-08-06T12:27:13Z

Codecov Report

❌ Patch coverage is 36.79245% with 67 lines in your changes missing coverage. Please review.
✅ Project coverage is 19.65%. Comparing base (4f11707) to head (8347dc6).
⚠️ Report is 8 commits behind head on main.

Files with missing lines	Patch %	Lines
...m/cloud/projects/dao/ProjectInvitationDaoImpl.java	0.00%	24 Missing ⚠️
.../com/cloud/projects/dao/ProjectAccountDaoImpl.java	0.00%	15 Missing ⚠️
...c/main/java/com/cloud/user/AccountManagerImpl.java	38.09%	13 Missing ⚠️
...main/java/com/cloud/projects/ProjectAccountVO.java	0.00%	3 Missing ⚠️
...n/java/com/cloud/projects/ProjectInvitationVO.java	0.00%	3 Missing ⚠️
.../org/apache/cloudstack/ldap/LdapAuthenticator.java	50.00%	3 Missing ⚠️
...in/java/com/cloud/projects/ProjectManagerImpl.java	90.32%	3 Missing ⚠️
...cloudstack/api/command/admin/user/MoveUserCmd.java	0.00%	1 Missing ⚠️
...rg/apache/cloudstack/region/RegionManagerImpl.java	0.00%	1 Missing ⚠️
...rg/apache/cloudstack/region/RegionServiceImpl.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               main   #13817   +/-   ##
=========================================
  Coverage     19.65%   19.65%           
- Complexity    19792    19798    +6     
=========================================
  Files          6368     6368           
  Lines        574881   574943   +62     
  Branches      70351    70355    +4     
=========================================
+ Hits         112970   113011   +41     
- Misses       449639   449658   +19     
- Partials      12272    12274    +2

Flag	Coverage Δ
uitests	`3.41% <ø> (ø)`
unittests	`20.93% <36.79%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 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.

weizhouapache

code lgtm

blueorangutan · 2026-08-06T13:07:06Z

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

weizhouapache · 2026-08-06T13:23:59Z

@blueorangutan test

blueorangutan · 2026-08-06T13:26:04Z

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

blueorangutan · 2026-08-07T05:47:16Z

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

Test	Result	Time (s)	Test File

sudo87

lgtm, tested the changes

winterhazel · 2026-08-07T12:06:40Z

Changing to draft, as I am making some changes to also cover a few cleanups I missed in the original PR that allow the creation of inconsistent entries.

winterhazel · 2026-08-07T12:07:07Z

@sudo87 thank you for testing!

DaanHoogland · 2026-08-12T09:52:32Z

@winterhazel does this need re-testing? (I saw you added commits)

winterhazel · 2026-08-12T11:59:26Z

@winterhazel does this need re-testing? (I saw you added commits)

@DaanHoogland yes, I need to test it as well. I will try to do it today.

winterhazel · 2026-08-12T23:38:38Z

@blueorangutan package

blueorangutan · 2026-08-12T23:40:05Z

@winterhazel 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.

blueorangutan · 2026-08-12T23:53:38Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 18843

winterhazel · 2026-08-13T00:36:30Z

@blueorangutan package

blueorangutan · 2026-08-13T00:38:06Z

@winterhazel 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.

blueorangutan · 2026-08-13T01:24:40Z

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

winterhazel · 2026-08-13T03:36:29Z

@DaanHoogland manual testing is done for this one. Can we run the smoke tests here?

sudo87 · 2026-08-13T04:09:07Z

@blueorangutan test

blueorangutan · 2026-08-13T04:10:03Z

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

blueorangutan · 2026-08-13T20:45:02Z

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

Test	Result	Time (s)	Test File

DaanHoogland · 2026-08-14T11:28:19Z

@winterhazel , will you merge this before rc3?

winterhazel · 2026-08-14T11:37:52Z

@winterhazel , will you merge this before rc3?

@DaanHoogland yes, this will be on RC3.

bernardodemarco

Performed some general tests, lgtm

bernardodemarco · 2026-08-14T19:08:38Z

+DELETE FROM `cloud`.`project_account` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);
+DELETE FROM `cloud`.`project_invitations` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);


Suggested change

DELETE FROM `cloud`.`project_account` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);

DELETE FROM `cloud`.`project_invitations` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);

DELETE FROM `cloud`.`project_account` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed` IS NOT NULL);

DELETE FROM `cloud`.`project_invitations` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed` IS NOT NULL);

Add back missing changes from apache#10008

3c21229

winterhazel added this to the 4.23.0 milestone Aug 6, 2026

winterhazel added the type:regression label Aug 6, 2026

winterhazel requested a review from weizhouapache August 6, 2026 12:17

weizhouapache approved these changes Aug 6, 2026

View reviewed changes

winterhazel changed the title ~~Add back missing changes from #10008~~ Add back missing changes from #10008 to 4.23 Aug 6, 2026

Additional cleanup on user deletion

18b7bee

sudo87 approved these changes Aug 7, 2026

View reviewed changes

winterhazel marked this pull request as draft August 7, 2026 12:05

winterhazel added 2 commits August 9, 2026 12:10

Move project invitations and associations when moving user

c464999

Adjustments

a59399a

boring-cyborg Bot added component:api component:projects labels Aug 11, 2026

Add missing catch

6ab275e

boring-cyborg Bot added the component:LDAP label Aug 12, 2026

winterhazel changed the title ~~Add back missing changes from #10008 to 4.23~~ Perform missing user cleanups (adds back missing changes from #10008 to 4.23) Aug 12, 2026

winterhazel changed the title ~~Perform missing user cleanups (adds back missing changes from #10008 to 4.23)~~ Add missing project cleanups while deleting/moving user Aug 13, 2026

winterhazel marked this pull request as ready for review August 13, 2026 00:31

Fix failing test

8347dc6

bernardodemarco approved these changes Aug 14, 2026

View reviewed changes

		DELETE FROM `cloud`.`project_account` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);
		DELETE FROM `cloud`.`project_invitations` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);

Uh oh!

Conversation

winterhazel commented Aug 6, 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?

DB upgrade

User cleanup

Remove user from a project

Move user

Uh oh!

winterhazel commented Aug 6, 2026

Uh oh!

blueorangutan commented Aug 6, 2026

Uh oh!

codecov Bot commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Aug 6, 2026

Uh oh!

weizhouapache commented Aug 6, 2026

Uh oh!

blueorangutan commented Aug 6, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

sudo87 left a comment

Choose a reason for hiding this comment

Uh oh!

winterhazel commented Aug 7, 2026

Uh oh!

winterhazel commented Aug 7, 2026

Uh oh!

DaanHoogland commented Aug 12, 2026

Uh oh!

winterhazel commented Aug 12, 2026

Uh oh!

winterhazel commented Aug 12, 2026

Uh oh!

blueorangutan commented Aug 12, 2026

Uh oh!

blueorangutan commented Aug 12, 2026

Uh oh!

winterhazel commented Aug 13, 2026

Uh oh!

blueorangutan commented Aug 13, 2026

Uh oh!

blueorangutan commented Aug 13, 2026

Uh oh!

winterhazel commented Aug 13, 2026

Uh oh!

sudo87 commented Aug 13, 2026

Uh oh!

blueorangutan commented Aug 13, 2026

Uh oh!

blueorangutan commented Aug 13, 2026

Uh oh!

DaanHoogland commented Aug 14, 2026

Uh oh!

winterhazel commented Aug 14, 2026

Uh oh!

bernardodemarco left a comment

Choose a reason for hiding this comment

Uh oh!

bernardodemarco Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

winterhazel commented Aug 6, 2026 •

edited

Loading

codecov Bot commented Aug 6, 2026 •

edited

Loading