[Draft] vm: add Expunged as final VM state and enable expunge VMs in Expunging state by weizhouapache · Pull Request #7029 · apache/cloudstack

weizhouapache · 2022-12-28T10:02:01Z

Description

main changes of this PR

Introduce a new state Expunged which is final vm state (currently the final vm state is Expunging)
Enable expunge a vm in Expunging state (current the action is disabled)
Update vm state to Expunged if succeed to expunge a VM
Update vm state to Error if fail to expunge a VM
Add Expunged but not removed VMs to VM cleanup task.

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?

codecov · 2022-12-28T12:07:00Z

Codecov Report

Merging #7029 (419fe3d) into main (5665782) will increase coverage by 0.01%.
The diff coverage is 11.86%.

@@             Coverage Diff              @@
##               main    #7029      +/-   ##
============================================
+ Coverage     11.76%   11.78%   +0.01%     
- Complexity     7661     7671      +10     
============================================
  Files          2503     2503              
  Lines        245958   245968      +10     
  Branches      38374    38378       +4     
============================================
+ Hits          28946    28990      +44     
+ Misses       213248   213200      -48     
- Partials       3764     3778      +14

Impacted Files	Coverage Δ
...tack/engine/orchestration/NetworkOrchestrator.java	`6.11% <0.00%> (ø)`
...ain/java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java	`0.69% <0.00%> (ø)`
...ain/java/com/cloud/vm/dao/DomainRouterDaoImpl.java	`33.77% <0.00%> (ø)`
...va/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java	`0.77% <0.00%> (ø)`
.../src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java	`0.75% <0.00%> (ø)`
.../main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java	`25.65% <0.00%> (ø)`
.../cloud/baremetal/manager/BaremetalManagerImpl.java	`0.00% <0.00%> (ø)`
...ck/network/contrail/model/VirtualMachineModel.java	`23.83% <ø> (ø)`
...ager/allocator/impl/UserConcentratedAllocator.java	`0.00% <0.00%> (ø)`
...ava/com/cloud/api/query/dao/UserVmJoinDaoImpl.java	`3.20% <0.00%> (+0.01%)`	⬆️
... and 15 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

weizhouapache · 2022-12-30T09:00:06Z

@blueorangutan package

blueorangutan · 2022-12-30T09:01:03Z

@weizhouapache a 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.

blueorangutan · 2022-12-30T09:48:26Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5139

weizhouapache · 2022-12-30T09:54:38Z

@blueorangutan test matrix

blueorangutan · 2022-12-30T09:55:03Z

@weizhouapache a Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2022-12-30T09:56:29Z

Trillian Build Failed (tid-5710)

…unged

weizhouapache · 2022-12-30T13:42:34Z

@blueorangutan package

blueorangutan · 2022-12-30T13:43:03Z

@weizhouapache a 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.

blueorangutan · 2022-12-30T14:32:00Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5142

blueorangutan · 2022-12-30T21:10:10Z

Trillian test result (tid-5708)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39310 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7029-t5708-xenserver-71.zip
Smoke tests completed. 106 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2022-12-30T22:30:41Z

Trillian test result (tid-5709)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 44081 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7029-t5709-vmware-67u3.zip
Smoke tests completed. 106 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2022-12-30T22:32:43Z

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

Test	Result	Time (s)	Test File

weizhouapache · 2023-01-02T14:52:09Z

@DaanHoogland
could you please review this PR ? thanks

DaanHoogland

clgtm

…e final state

weizhouapache · 2023-01-03T10:36:40Z

@blueorangutan package

blueorangutan · 2023-01-03T10:37:03Z

@weizhouapache a 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.

Co-authored-by: dahn <daan.hoogland@gmail.com>

weizhouapache · 2023-01-03T11:13:09Z

@blueorangutan package

blueorangutan · 2023-01-03T11:14:03Z

@weizhouapache a 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.

blueorangutan · 2023-01-03T11:25:34Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5158

blueorangutan · 2023-01-03T12:01:50Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5159

weizhouapache · 2023-01-03T12:42:36Z

@blueorangutan test

blueorangutan · 2023-01-03T12:43:03Z

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

blueorangutan · 2023-01-04T00:08:54Z

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

Test	Result	Time (s)	Test File

weizhouapache · 2023-01-12T08:08:18Z

@DaanHoogland
moved to draft. let's revisit afterwards

weizhouapache · 2023-01-12T08:15:48Z

small fix: #7086

github-actions · 2023-01-13T05:19:08Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

…unged

sonarqubecloud · 2023-01-13T08:44:46Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

13.4% Coverage
2.7% Duplication

yadvr · 2023-01-27T10:15:18Z

@weizhouapache should this be closed as the simpler fix is merged now? https://github.com/apache/cloudstack/pull/7086/files ?

weizhouapache added 2 commits December 28, 2022 10:38

vm: add Expunged as final VM state and enable destroy Expunging vms

cc7489d

server: Update vm state to Expunged or Error after expunging

3815b9c

boring-cyborg Bot added component:api component:compute component:networking component:orchestration component:storage component:UI labels Dec 28, 2022

Merge remote-tracking branch 'apache/main' into 4.18-add-vm-state-Exp…

e67bb47

…unged

weizhouapache added this to the 4.18.0.0 milestone Dec 30, 2022

Update: add unit tests

836ed59

weizhouapache requested a review from DaanHoogland January 2, 2023 14:51

DaanHoogland reviewed Jan 3, 2023

View reviewed changes

Comment thread api/src/main/java/com/cloud/vm/VirtualMachine.java Outdated

DaanHoogland approved these changes Jan 3, 2023

View reviewed changes

weizhouapache added 2 commits January 3, 2023 11:24

Update: do not remove template of Expunging vms as Expunged is now th…

36401ac

…e final state

Update: skip Destroying Expunging/Expunged VMs if expunge is false

f634985

Update api/src/main/java/com/cloud/vm/VirtualMachine.java

78ccba0

Co-authored-by: dahn <daan.hoogland@gmail.com>

DaanHoogland marked this pull request as ready for review January 9, 2023 09:43

weizhouapache modified the milestones: 4.18.0.0, 4.18.1.0 Jan 12, 2023

weizhouapache marked this pull request as draft January 12, 2023 08:08

github-actions Bot added the status:has-conflicts label Jan 13, 2023

Merge remote-tracking branch 'apache/main' into 4.18-add-vm-state-Exp…

419fe3d

…unged

github-actions Bot removed the status:has-conflicts label Jan 13, 2023

weizhouapache changed the title ~~vm: add Expunged as final VM state and enable expunge VMs in Expunging state~~ [WIP] vm: add Expunged as final VM state and enable expunge VMs in Expunging state Jan 17, 2023

weizhouapache changed the title ~~[WIP] vm: add Expunged as final VM state and enable expunge VMs in Expunging state~~ [Draft] vm: add Expunged as final VM state and enable expunge VMs in Expunging state Jan 17, 2023

weizhouapache closed this Jan 27, 2023

weizhouapache modified the milestones: 4.18.1.0, 4.19.0.0 Feb 21, 2023

weizhouapache deleted the 4.18-add-vm-state-Expunged branch June 23, 2023 13:08

Conversation

weizhouapache commented Dec 28, 2022

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

codecov Bot commented Dec 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

weizhouapache commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

weizhouapache commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

blueorangutan commented Dec 30, 2022

Uh oh!

weizhouapache commented Jan 2, 2023

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Jan 3, 2023

Uh oh!

blueorangutan commented Jan 3, 2023

Uh oh!

weizhouapache commented Jan 3, 2023

Uh oh!

blueorangutan commented Jan 3, 2023

Uh oh!

blueorangutan commented Jan 3, 2023

Uh oh!

blueorangutan commented Jan 3, 2023

Uh oh!

weizhouapache commented Jan 3, 2023

Uh oh!

blueorangutan commented Jan 3, 2023

Uh oh!

blueorangutan commented Jan 4, 2023

Uh oh!

weizhouapache commented Jan 12, 2023

Uh oh!

weizhouapache commented Jan 12, 2023

Uh oh!

github-actions Bot commented Jan 13, 2023

Uh oh!

sonarqubecloud Bot commented Jan 13, 2023

Uh oh!

yadvr commented Jan 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov Bot commented Dec 28, 2022 •

edited

Loading