Skip to content

engine-schema: add removed column for cloud.user_data, fix delete op - #9120

Merged
DaanHoogland merged 1 commit into
apache:4.19from
shapeblue:fix-userdata-delete
May 28, 2024
Merged

engine-schema: add removed column for cloud.user_data, fix delete op#9120
DaanHoogland merged 1 commit into
apache:4.19from
shapeblue:fix-userdata-delete

Conversation

@shwstppr

@shwstppr shwstppr commented May 24, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Adds removed column for cloud.user_data table.
Fixes deletion of userdata when template is removed.

Fixes #8703

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

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?

  • Added a userdata
  • Added a template using the userdata
  • Deployed a VM using template
  • Deleted both VM and template
  • Tested userdata deletion
    Screenshot from 2024-05-24 12-34-52
    Screenshot from 2024-05-24 12-34-36
    Screenshot from 2024-05-24 12-33-57

Before:
Screenshot from 2024-05-24 12-36-04

After:

userdata-delete-after.mp4

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

@shwstppr
engine-schema: add removed columne for cloud.user_data, fix delete op
f02ab50 
Fixes apache#8703

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr

shwstppr commented May 24, 2024

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

blueorangutan commented May 24, 2024

Copy link
Copy Markdown

@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

codecov Bot commented May 24, 2024 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 14.96%. Comparing base (87e7c57) to head (f02ab50).
Report is 6 commits behind head on 4.19.

Files Patch % Lines
...chema/src/main/java/com/cloud/user/UserDataVO.java 0.00% 6 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               4.19    #9120      +/-   ##
============================================
- Coverage     14.96%   14.96%   -0.01%     
+ Complexity    10995    10985      -10     
============================================
  Files          5373     5373              
  Lines        469005   469030      +25     
  Branches      58953    57844    -1109     
============================================
- Hits          70198    70180      -18     
- Misses       391036   391080      +44     
+ Partials       7771     7770       -1
Flag Coverage Δ
uitests 4.31% <ø> (ø)
unittests 15.66% <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.

@blueorangutan

blueorangutan commented May 24, 2024

Copy link
Copy Markdown

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

@shwstppr shwstppr changed the title engine-schema: add removed columne for cloud.user_data, fix delete op engine-schema: add removed column for cloud.user_data, fix delete op May 24, 2024
@shwstppr

shwstppr commented May 24, 2024

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

blueorangutan commented May 24, 2024

Copy link
Copy Markdown

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

vishesh92
vishesh92 approved these changes May 24, 2024
View reviewed changes

@vishesh92 vishesh92 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

clgtm

weizhouapache
weizhouapache approved these changes May 24, 2024
View reviewed changes

@weizhouapache weizhouapache left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

code lgtm

@weizhouapache weizhouapache added this to the 4.19.1.0 milestone May 24, 2024
@blueorangutan

blueorangutan commented May 25, 2024

Copy link
Copy Markdown

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

Test Result Time (s) Test File

@shwstppr
shwstppr requested a review from sureshanaparti May 27, 2024 08:30
DaanHoogland
DaanHoogland approved these changes May 28, 2024
View reviewed changes

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clgtm, tested in lab env

@DaanHoogland
DaanHoogland merged commit c970141 into apache:4.19 May 28, 2024
@DaanHoogland
DaanHoogland deleted the fix-userdata-delete branch May 28, 2024 07:43
@shwstppr shwstppr mentioned this pull request May 28, 2024
Closed
DaanHoogland added a commit that referenced this pull request May 28, 2024
@DaanHoogland
Merge release branch 4.19 to main
f1c3d2c 
* 4.19:
  engine-schema: add removed columne for cloud.user_data, fix delete op (#9120)
  ui: fix create menu item access (#9104)
  server: honor listall param for listiso api (#9064)
  ui: add move to top/bottom for acl rules list (#9119)
  ui: fix columns for exportacls csv (#9118)
  ui: fix create network access in deploy vm wizard (#9117)
  UI: Add search filters (#9068)
@shwstppr shwstppr mentioned this pull request May 29, 2024
Merged
1 of 13 tasks
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 17, 2024
@shwstppr @dhslove
engine-schema: add removed columne for cloud.user_data, fix delete op (…
bb532c8 
…apache#9120)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 17, 2024
@DaanHoogland @dhslove
Merge release branch 4.19 to main
a88f395 
* 4.19:
  engine-schema: add removed columne for cloud.user_data, fix delete op (apache#9120)
  ui: fix create menu item access (apache#9104)
  server: honor listall param for listiso api (apache#9064)
  ui: add move to top/bottom for acl rules list (apache#9119)
  ui: fix columns for exportacls csv (apache#9118)
  ui: fix create network access in deploy vm wizard (apache#9117)
  UI: Add search filters (apache#9068)
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
@weizhouapache weizhouapache weizhouapache approved these changes
@sureshanaparti sureshanaparti Awaiting requested review from sureshanaparti

Assignees

No one assigned

Labels

None yet

Projects

ACS Backlog
Status: Abhishek's Bugfix List
Apache CloudStack 4.19.1
Status: No status

Milestone

4.19.1.0

Development

Successfully merging this pull request may close these issues.

5 participants

@shwstppr @blueorangutan @DaanHoogland @vishesh92 @weizhouapache