Improve logs in primary storage removal process

[hsato03]

Description

While listing volumes from a primary storage, volumes from system VMs are not listed, making the primary storage removal process difficult as an exception is thrown if the storage still has active volumes when trying to be deleted.

For this reason, logs have been added to the primary storage removal process, informing which undestroyed volumes are associated with the primary storage and which instance they are allocated to if an exception is thrown during the process.

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)
• [X] 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
• [X] Minor

Bug Severity

• [ ] BLOCKER
• [ ] Critical
• [ ] Major
• [ ] Minor
• [ ] Trivial

Screenshots (if appropriate):

How Has This Been Tested?

I tried to delete a primary storage with active volumes, then I checked through the logs that all volumes and the VM associated with them were presented.

[DaanHoogland]

not sure if we have any automated way of testing this (yet)

[codecov[bot]]

Codecov Report

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

Project coverage is 30.92%. Comparing base (8f6721e) to head (80a7e11).

Files	Patch %	Lines
...ain/java/com/cloud/storage/StorageManagerImpl.java	57.89%	7 Missing and 1 partial :warning:

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #8649      +/-   ##
============================================
+ Coverage     30.90%   30.92%   +0.02%     
- Complexity    33382    33426      +44     
============================================
  Files          5355     5355              
  Lines        375727   375740      +13     
  Branches      54915    54916       +1     
============================================
+ Hits         116109   116192      +83     
+ Misses       244219   244132      -87     
- Partials      15399    15416      +17     

Flag	Coverage Δ
simulator-marvin-tests	24.76% <0.00%> (-0.01%)	:arrow_down:
uitests	4.36% <ø> (ø)
unit-tests	16.57% <57.89%> (+<0.01%)	:arrow_up:

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

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[DaanHoogland]

@blueorangutan package

[blueorangutan]

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

[blueorangutan]

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

[github-actions[bot]]

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

[DaanHoogland]

@blueorangutan package

[blueorangutan]

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

[blueorangutan]

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

[blueorangutan]

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

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_01_condensed_drs_algorithm	Failure	172.42	test_cluster_drs.py
test_04_deploy_vnf_appliance	Error	92.44	test_vnf_templates.py
test_04_deploy_vnf_appliance	Error	92.44	test_vnf_templates.py
test_05_delete_vnf_template	Error	0.05	test_vnf_templates.py
ContextSuite context=TestVnfTemplates>:teardown	Error	0.16	test_vnf_templates.py

[github-actions[bot]]

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

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 15.56%. Comparing base (cea4801) to head (1a1b80e). Report is 79 commits behind head on main.

Files	Patch %	Lines
...ain/java/com/cloud/storage/StorageManagerImpl.java	61.90%	7 Missing and 1 partial :warning:

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #8649      +/-   ##
============================================
+ Coverage     15.53%   15.56%   +0.03%     
- Complexity    11967    12024      +57     
============================================
  Files          5492     5500       +8     
  Lines        480934   481899     +965     
  Branches      60876    61193     +317     
============================================
+ Hits          74711    75024     +313     
- Misses       397962   398585     +623     
- Partials       8261     8290      +29     

Flag	Coverage Δ
uitests	4.17% <ø> (-0.01%)	:arrow_down:
unittests	16.34% <61.90%> (+0.04%)	:arrow_up:

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

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[BryanMLima]

@blueorangutan package

[blueorangutan]

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

[blueorangutan]

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

[github-actions[bot]]

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

[DaanHoogland]

@blueorangutan package

[blueorangutan]

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

[blueorangutan]

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

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_role_account_acls_multiple_mgmt_servers	Error	2.17	test_dynamicroles.py
test_query_async_job_result	Error	97.69	test_async_job.py
test_revoke_certificate	Error	0.01	test_certauthority_root.py
test_configure_ha_provider_invalid	Error	0.01	test_hostha_simulator.py
test_configure_ha_provider_valid	Error	0.01	test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzones	Error	0.01	test_hostha_simulator.py
test_ha_disable_feature_invalid	Error	0.01	test_hostha_simulator.py
test_ha_enable_feature_invalid	Error	0.01	test_hostha_simulator.py
test_ha_list_providers	Error	0.01	test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownership	Error	0.01	test_hostha_simulator.py
test_ha_verify_fsm_available	Error	0.01	test_hostha_simulator.py
test_ha_verify_fsm_degraded	Error	0.01	test_hostha_simulator.py
test_ha_verify_fsm_fenced	Error	0.01	test_hostha_simulator.py
test_ha_verify_fsm_recovering	Error	0.01	test_hostha_simulator.py
test_hostha_configure_default_driver	Error	0.01	test_hostha_simulator.py
test_hostha_configure_invalid_provider	Error	0.01	test_hostha_simulator.py
test_hostha_disable_feature_valid	Error	0.01	test_hostha_simulator.py
test_hostha_enable_feature_valid	Error	0.01	test_hostha_simulator.py
test_hostha_enable_feature_without_setting_provider	Error	0.01	test_hostha_simulator.py
test_list_ha_for_host	Error	0.01	test_hostha_simulator.py
test_list_ha_for_host_invalid	Error	0.01	test_hostha_simulator.py
test_list_ha_for_host_valid	Error	0.01	test_hostha_simulator.py
test_01_host_ping_on_alert	Error	0.08	test_host_ping.py
test_01_host_ping_on_alert	Error	0.08	test_host_ping.py
test_01_browser_migrate_template	Error	15.36	test_image_store_object_migration.py
test_01_invalid_upgrade_kubernetes_cluster	Failure	227.56	test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster	Failure	229.53	test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster	Failure	227.19	test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster	Failure	236.73	test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster	Failure	220.50	test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster	Failure	230.31	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	Failure	314.60	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	Failure	242.26	test_kubernetes_clusters.py
test_11_test_unmanaged_cluster_lifecycle	Error	81.75	test_kubernetes_clusters.py
test_01_add_delete_kubernetes_supported_version	Error	0.11	test_kubernetes_supported_versions.py
login_test_saml_user	Error	2.89	test_login.py
test_01_deployVMInSharedNetwork	Error	76.27	test_network.py
test_03_destroySharedNetwork	Failure	1.08	test_network.py
ContextSuite context=TestSharedNetwork>:teardown	Error	2.18	test_network.py
test_oobm_issue_power_cycle	Error	3.31	test_outofbandmanagement_nestedplugin.py
test_oobm_issue_power_off	Error	3.28	test_outofbandmanagement_nestedplugin.py
test_oobm_issue_power_on	Error	3.28	test_outofbandmanagement_nestedplugin.py
test_oobm_issue_power_reset	Error	3.30	test_outofbandmanagement_nestedplugin.py
test_oobm_issue_power_soft	Error	3.30	test_outofbandmanagement_nestedplugin.py
test_oobm_issue_power_status	Error	2.21	test_outofbandmanagement_nestedplugin.py
test_oobm_background_powerstate_sync	Failure	21.61	test_outofbandmanagement.py
test_oobm_background_powerstate_sync	Error	21.61	test_outofbandmanagement.py
test_oobm_configure_default_driver	Error	0.05	test_outofbandmanagement.py
test_oobm_configure_invalid_driver	Error	0.07	test_outofbandmanagement.py
test_oobm_disable_feature_invalid	Error	0.04	test_outofbandmanagement.py
test_oobm_disable_feature_valid	Error	1.14	test_outofbandmanagement.py
test_oobm_enable_feature_invalid	Error	0.04	test_outofbandmanagement.py
test_oobm_enable_feature_valid	Error	1.12	test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones	Error	11.83	test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones	Error	11.83	test_outofbandmanagement.py
test_oobm_issue_power_cycle	Error	4.35	test_outofbandmanagement.py
test_oobm_issue_power_cycle	Error	4.35	test_outofbandmanagement.py
test_oobm_issue_power_off	Error	4.32	test_outofbandmanagement.py
test_oobm_issue_power_off	Error	4.32	test_outofbandmanagement.py
test_oobm_issue_power_on	Error	3.31	test_outofbandmanagement.py
test_oobm_issue_power_on	Error	3.31	test_outofbandmanagement.py
test_oobm_issue_power_reset	Error	4.33	test_outofbandmanagement.py
test_oobm_issue_power_reset	Error	4.33	test_outofbandmanagement.py
test_oobm_issue_power_soft	Error	4.35	test_outofbandmanagement.py
test_oobm_issue_power_soft	Error	4.35	test_outofbandmanagement.py
test_oobm_issue_power_status	Error	3.30	test_outofbandmanagement.py
test_oobm_issue_power_status	Error	3.30	test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership	Error	1.13	test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership	Error	1.14	test_outofbandmanagement.py
test_oobm_zchange_password	Error	0.17	test_outofbandmanagement.py
test_oobm_zchange_password	Error	0.17	test_outofbandmanagement.py
test_02_edit_primary_storage_tags	Error	0.02	test_primary_storage.py
test_01_primary_storage_scope_change	Error	0.07	test_primary_storage_scope.py
test_01_vpc_privategw_acl	Error	0.03	test_privategw_acl_ovs_gre.py
test_03_vpc_privategw_restart_vpc_cleanup	Error	0.02	test_privategw_acl_ovs_gre.py
test_05_vpc_privategw_check_interface	Error	0.02	test_privategw_acl_ovs_gre.py
test_01_vpc_privategw_acl	Error	53.49	test_privategw_acl.py
test_02_vpc_privategw_static_routes	Error	201.69	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	Error	202.84	test_privategw_acl.py
test_04_rvpc_privategw_static_routes	Error	319.30	test_privategw_acl.py
test_01_purge_expunged_api_vm_start_date	Error	48.58	test_purge_expunged_vms.py
test_02_purge_expunged_api_vm_end_date	Error	41.03	test_purge_expunged_vms.py
test_03_purge_expunged_api_vm_start_end_date	Error	44.91	test_purge_expunged_vms.py
test_04_purge_expunged_api_vm_no_date	Error	44.16	test_purge_expunged_vms.py
test_05_purge_expunged_vm_service_offering	Error	269.12	test_purge_expunged_vms.py
test_06_purge_expunged_vm_background_task	Error	329.86	test_purge_expunged_vms.py
test_01_snapshot_root_disk	Error	3.28	test_snapshots.py
test_CreateTemplateWithDuplicateName	Error	25.13	test_templates.py
test_01_register_template_direct_download_flag	Error	0.15	test_templates.py
test_01_positive_tests_usage	Error	10.41	test_usage_events.py
test_01_ISO_usage	Error	1.12	test_usage.py
test_01_lb_usage	Error	4.25	test_usage.py
test_01_nat_usage	Error	8.34	test_usage.py
test_01_public_ip_usage	Error	1.07	test_usage.py
test_01_snapshot_usage	Error	35.98	test_usage.py
test_01_template_usage	Error	13.51	test_usage.py
test_01_vm_usage	Error	132.96	test_usage.py
test_01_volume_usage	Error	129.04	test_usage.py
test_01_vpn_usage	Error	8.45	test_usage.py
test_12_start_vm_multiple_volumes_allocated	Error	10.59	test_vm_life_cycle.py
test_01_vmschedule_create	Error	0.10	test_vm_schedule.py
test_disable_oobm_ha_state_ineligible	Error	0.06	test_hostha_kvm.py
test_hostha_configure_default_driver	Error	0.04	test_hostha_kvm.py
test_hostha_enable_ha_when_host_disabled	Error	0.04	test_hostha_kvm.py
test_hostha_enable_ha_when_host_disconected	Error	0.04	test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance	Error	0.04	test_hostha_kvm.py
test_hostha_kvm_host_degraded	Error	0.04	test_hostha_kvm.py
test_hostha_kvm_host_fencing	Error	0.05	test_hostha_kvm.py
test_hostha_kvm_host_recovering	Error	0.05	test_hostha_kvm.py
test_remove_ha_provider_not_possible	Error	0.05	test_hostha_kvm.py

[DaanHoogland]

@blueorangutan test alma9 kvm-alma9

[blueorangutan]

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

[blueorangutan]

[SF] Trillian Build Failed (tid-10822)

[DaanHoogland]

@blueorangutan package

[blueorangutan]

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