Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLOUDSTACK-9932 snapshot is getting deleted while volume is in creating state #2149

Merged
merged 1 commit into from Jan 4, 2018
Merged

Conversation

pavanaravapalli
Copy link
Contributor

Added validation to check if any volume(s) are in creating state , before performing delete snapshot.

@pavanaravapalli pavanaravapalli changed the title CLOUDSTACK-9932 Bug Fix :- Snapshot is getting deleted while volume c… CLOUDSTACK-9932 snapshot is getting deleted while volume creating state Jun 15, 2017
@pavanaravapalli pavanaravapalli changed the title CLOUDSTACK-9932 snapshot is getting deleted while volume creating state CLOUDSTACK-9932 snapshot is getting deleted while volume is in creating state Jun 15, 2017
volumeCheck = _volumeDetailsDaoImpl.findDetails("SNAPSHOT_ID", String.valueOf(snapshotId), null);

if (volumeCheck.size() > 0) {
throw new InvalidParameterValueException("Unable to perform delete operation, Snapshot with id: " + snapshotId + " is in using ");
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you change "is in using" to "is in use" ? That would be a better log line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wido changes done as suggested

@@ -530,6 +534,13 @@ public boolean deleteSnapshot(long snapshotId) {
return false;
}

List<VolumeDetailVO> volumeCheck;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you update the variable name to more meaningful. eg: volumesFromSnapshot, volumesFromSnapshotCheck,...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sureshanaparti changes done as suggested

if (volumeCheck.size() > 0) {
throw new InvalidParameterValueException("Unable to perform delete operation, Snapshot with id: " + snapshotId + " is in use ");
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Any other approach to check the volumes creating from a given snapshot?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When a volume created from snapshot, we are not maintaining volume in relation to snapshot details anywhere in database. It's been recently integrated and information stored in VOLUME_DETAILS table.

Data/Records in this table will be persist till volume creation operation finish(success/failure). Once volume operation done this record will be removed. I have not come across alternatives other than this approach.

Copy link
Contributor

Choose a reason for hiding this comment

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

@pavanaravapalli thanks for the confirmation.

@sureshanaparti
Copy link
Contributor

Code changes LGTM.

List<VolumeDetailVO> volumesFromSnapshot;
volumesFromSnapshot = _volumeDetailsDaoImpl.findDetails("SNAPSHOT_ID", String.valueOf(snapshotId), null);

if (volumesFromSnapshot.size() > 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

There could be race condition here. After volumesFromSnapshot = 0, a new volume can be created from snapshot, before the snapshot is actually deleted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@kishankavala race condition problem handled and, code changes done accordingly

Copy link
Contributor

@kishankavala kishankavala left a comment

Choose a reason for hiding this comment

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

LGTM

@borisstoyanov
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-793

@borisstoyanov
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Trillian test result (tid-1194)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36243 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2149-t1194-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Test completed. 48 look ok, 3 have error(s)

Test Result Time (s) Test File
test_02_redundant_VPC_default_routes Failure 848.81 test_vpc_redundant.py
test_04_rvpc_privategw_static_routes Failure 416.94 test_privategw_acl.py
ContextSuite context=TestSnapshotRootDisk>:teardown Error 102.14 test_snapshots.py
test_01_vpc_site2site_vpn Success 159.94 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Success 56.05 test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn Success 240.32 test_vpc_vpn.py
test_02_VPC_default_routes Success 264.30 test_vpc_router_nics.py
test_01_VPC_nics_after_destroy Success 458.33 test_vpc_router_nics.py
test_05_rvpc_multi_tiers Success 504.77 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Success 1283.06 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Success 542.46 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Success 1293.89 test_vpc_redundant.py
test_09_delete_detached_volume Success 156.61 test_volumes.py
test_08_resize_volume Success 156.52 test_volumes.py
test_07_resize_fail Success 161.69 test_volumes.py
test_06_download_detached_volume Success 151.46 test_volumes.py
test_05_detach_volume Success 150.83 test_volumes.py
test_04_delete_attached_volume Success 151.43 test_volumes.py
test_03_download_attached_volume Success 156.35 test_volumes.py
test_02_attach_volume Success 89.39 test_volumes.py
test_01_create_volume Success 712.39 test_volumes.py
test_03_delete_vm_snapshots Success 275.21 test_vm_snapshots.py
test_02_revert_vm_snapshots Success 100.90 test_vm_snapshots.py
test_01_create_vm_snapshots Success 139.46 test_vm_snapshots.py
test_deploy_vm_multiple Success 253.06 test_vm_life_cycle.py
test_deploy_vm Success 0.04 test_vm_life_cycle.py
test_advZoneVirtualRouter Success 0.03 test_vm_life_cycle.py
test_10_attachAndDetach_iso Success 26.97 test_vm_life_cycle.py
test_09_expunge_vm Success 125.18 test_vm_life_cycle.py
test_08_migrate_vm Success 31.29 test_vm_life_cycle.py
test_07_restore_vm Success 0.15 test_vm_life_cycle.py
test_06_destroy_vm Success 125.90 test_vm_life_cycle.py
test_03_reboot_vm Success 125.96 test_vm_life_cycle.py
test_02_start_vm Success 10.26 test_vm_life_cycle.py
test_01_stop_vm_forced Success 5.17 test_vm_life_cycle.py
test_01_stop_vm Success 30.32 test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName Success 116.08 test_templates.py
test_08_list_system_templates Success 0.04 test_templates.py
test_07_list_public_templates Success 0.05 test_templates.py
test_05_template_permissions Success 0.08 test_templates.py
test_04_extract_template Success 5.23 test_templates.py
test_03_delete_template Success 5.15 test_templates.py
test_02_edit_template Success 90.14 test_templates.py
test_01_create_template Success 45.61 test_templates.py
test_10_destroy_cpvm Success 161.69 test_ssvm.py
test_09_destroy_ssvm Success 163.68 test_ssvm.py
test_08_reboot_cpvm Success 131.69 test_ssvm.py
test_07_reboot_ssvm Success 163.34 test_ssvm.py
test_06_stop_cpvm Success 131.73 test_ssvm.py
test_05_stop_ssvm Success 133.58 test_ssvm.py
test_04_cpvm_internals Success 1.23 test_ssvm.py
test_03_ssvm_internals Success 3.30 test_ssvm.py
test_02_list_cpvm_vm Success 0.18 test_ssvm.py
test_01_list_sec_storage_vm Success 0.15 test_ssvm.py
test_02_list_snapshots_with_removed_data_store Success 86.86 test_snapshots.py
test_01_snapshot_root_disk Success 16.20 test_snapshots.py
test_04_change_offering_small Success 205.46 test_service_offerings.py
test_03_delete_service_offering Success 0.05 test_service_offerings.py
test_02_edit_service_offering Success 0.06 test_service_offerings.py
test_01_create_service_offering Success 0.12 test_service_offerings.py
test_02_sys_template_ready Success 0.17 test_secondary_storage.py
test_01_sys_vm_start Success 0.21 test_secondary_storage.py
test_09_reboot_router Success 40.38 test_routers.py
test_08_start_router Success 35.38 test_routers.py
test_07_stop_router Success 10.23 test_routers.py
test_06_router_advanced Success 0.09 test_routers.py
test_05_router_basic Success 0.06 test_routers.py
test_04_restart_network_wo_cleanup Success 5.93 test_routers.py
test_03_restart_network_cleanup Success 75.83 test_routers.py
test_02_router_internal_adv Success 0.94 test_routers.py
test_01_router_internal_basic Success 0.56 test_routers.py
test_router_dns_guestipquery Success 74.06 test_router_dns.py
test_router_dns_externalipquery Success 0.09 test_router_dns.py
test_router_dhcphosts Success 242.35 test_router_dhcphosts.py
test_router_dhcp_opts Success 21.78 test_router_dhcphosts.py
test_01_updatevolumedetail Success 0.12 test_resource_detail.py
test_01_reset_vm_on_reboot Success 171.39 test_reset_vm_on_reboot.py
test_createRegion Success 0.06 test_regions.py
test_create_pvlan_network Success 5.23 test_pvlan.py
test_dedicatePublicIpRange Success 0.45 test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanup Success 492.32 test_privategw_acl.py
test_02_vpc_privategw_static_routes Success 366.26 test_privategw_acl.py
test_01_vpc_privategw_acl Success 87.64 test_privategw_acl.py
test_03_migration_options_storage_tags Success 66.41 test_primary_storage.py
test_02_edit_primary_storage_tags Success 0.14 test_primary_storage.py
test_01_primary_storage_nfs Success 35.96 test_primary_storage.py
test_01_deploy_vms_storage_tags Success 31.31 test_primary_storage.py
test_createPortablePublicIPRange Success 10.24 test_portable_publicip.py
test_createPortablePublicIPAcquire Success 15.59 test_portable_publicip.py
test_isolate_network_password_server Success 61.24 test_password_server.py
test_UpdateStorageOverProvisioningFactor Success 0.22 test_over_provisioning.py
test_oobm_zchange_password Success 25.73 test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership Success 16.46 test_outofbandmanagement.py
test_oobm_issue_power_status Success 10.33 test_outofbandmanagement.py
test_oobm_issue_power_soft Success 15.54 test_outofbandmanagement.py
test_oobm_issue_power_reset Success 15.47 test_outofbandmanagement.py
test_oobm_issue_power_on Success 15.52 test_outofbandmanagement.py
test_oobm_issue_power_off Success 10.51 test_outofbandmanagement.py
test_oobm_issue_power_cycle Success 15.58 test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones Success 93.15 test_outofbandmanagement.py
test_oobm_enable_feature_valid Success 0.26 test_outofbandmanagement.py
test_oobm_enable_feature_invalid Success 0.17 test_outofbandmanagement.py
test_oobm_disable_feature_valid Success 5.29 test_outofbandmanagement.py
test_oobm_disable_feature_invalid Success 0.15 test_outofbandmanagement.py
test_oobm_configure_invalid_driver Success 0.10 test_outofbandmanagement.py
test_oobm_configure_default_driver Success 0.12 test_outofbandmanagement.py
test_oobm_background_powerstate_sync Success 23.50 test_outofbandmanagement.py
test_extendPhysicalNetworkVlan Success 15.41 test_non_contigiousvlan.py
test_01_nic Success 455.01 test_nic.py
test_releaseIP Success 248.24 test_network.py
test_reboot_router Success 469.85 test_network.py
test_public_ip_user_account Success 10.30 test_network.py
test_public_ip_admin_account Success 40.40 test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule Success 66.80 test_network.py
test_network_rules_acquired_public_ip_2_nat_rule Success 61.66 test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule Success 130.54 test_network.py
test_delete_account Success 318.61 test_network.py
test_02_port_fwd_on_non_src_nat Success 85.99 test_network.py
test_01_port_fwd_on_src_nat Success 112.02 test_network.py
test_nic_secondaryip_add_remove Success 253.65 test_multipleips_per_nic.py
test_list_zones_metrics Success 0.34 test_metrics_api.py
test_list_volumes_metrics Success 5.75 test_metrics_api.py
test_list_vms_metrics Success 217.69 test_metrics_api.py
test_list_pstorage_metrics Success 0.62 test_metrics_api.py
test_list_infrastructure_metrics Success 0.79 test_metrics_api.py
test_list_hosts_metrics Success 0.52 test_metrics_api.py
test_list_clusters_metrics Success 0.49 test_metrics_api.py
login_test_saml_user Success 20.01 test_login.py
test_assign_and_removal_lb Success 136.34 test_loadbalance.py
test_02_create_lb_rule_non_nat Success 189.09 test_loadbalance.py
test_01_create_lb_rule_src_nat Success 209.57 test_loadbalance.py
test_03_list_snapshots Success 0.09 test_list_ids_parameter.py
test_02_list_templates Success 0.04 test_list_ids_parameter.py
test_01_list_volumes Success 0.04 test_list_ids_parameter.py
test_07_list_default_iso Success 0.06 test_iso.py
test_05_iso_permissions Success 0.06 test_iso.py
test_04_extract_Iso Success 5.22 test_iso.py
test_03_delete_iso Success 95.17 test_iso.py
test_02_edit_iso Success 0.10 test_iso.py
test_01_create_iso Success 21.04 test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces Success 208.70 test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces Success 153.11 test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 Success 533.58 test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 Success 454.82 test_internal_lb.py
test_dedicateGuestVlanRange Success 5.50 test_guest_vlan_range.py
test_UpdateConfigParamWithScope Success 0.17 test_global_settings.py
test_rolepermission_lifecycle_update Success 6.57 test_dynamicroles.py
test_rolepermission_lifecycle_list Success 6.39 test_dynamicroles.py
test_rolepermission_lifecycle_delete Success 6.13 test_dynamicroles.py
test_rolepermission_lifecycle_create Success 6.08 test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates Success 6.47 test_dynamicroles.py
test_role_lifecycle_update_role_inuse Success 6.21 test_dynamicroles.py
test_role_lifecycle_update Success 11.77 test_dynamicroles.py
test_role_lifecycle_list Success 6.47 test_dynamicroles.py
test_role_lifecycle_delete Success 11.42 test_dynamicroles.py
test_role_lifecycle_create Success 6.15 test_dynamicroles.py
test_role_inuse_deletion Success 6.13 test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers Success 9.77 test_dynamicroles.py
test_role_account_acls Success 10.80 test_dynamicroles.py
test_default_role_deletion Success 6.56 test_dynamicroles.py
test_04_create_fat_type_disk_offering Success 0.21 test_disk_offerings.py
test_03_delete_disk_offering Success 0.16 test_disk_offerings.py
test_02_edit_disk_offering Success 0.09 test_disk_offerings.py
test_02_create_sparse_type_disk_offering Success 0.23 test_disk_offerings.py
test_01_create_disk_offering Success 0.15 test_disk_offerings.py
test_deployvm_userdispersing Success 20.91 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated Success 30.79 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit Success 111.08 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post Success 10.49 test_deploy_vm_with_userdata.py
test_deployvm_userdata Success 101.24 test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize Success 0.08 test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize Success 0.07 test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize Success 272.67 test_deploy_vm_root_resize.py
test_deploy_vm_from_iso Success 207.91 test_deploy_vm_iso.py
test_06_verify_guest_lspci_again Success 40.47 test_deploy_virtio_scsi_vm.py
test_05_change_vm_ostype_restart Success 16.35 test_deploy_virtio_scsi_vm.py
test_04_verify_guest_lspci Success 40.48 test_deploy_virtio_scsi_vm.py
test_03_verify_libvirt_attach_disk Success 6.18 test_deploy_virtio_scsi_vm.py
test_02_verify_libvirt_after_restart Success 137.08 test_deploy_virtio_scsi_vm.py
test_01_verify_libvirt Success 0.48 test_deploy_virtio_scsi_vm.py
test_DeployVmAntiAffinityGroup Success 76.25 test_affinity_groups.py
test_change_service_offering_for_vm_with_snapshots Skipped 0.00 test_vm_snapshots.py
test_09_copy_delete_template Skipped 0.02 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.02 test_staticroles.py
test_11_ss_nfs_version_on_ssvm Skipped 0.02 test_ssvm.py
test_01_scale_vm Skipped 0.00 test_scale_vm.py
test_01_primary_storage_iscsi Skipped 0.05 test_primary_storage.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_06_copy_iso Skipped 0.00 test_iso.py
test_deploy_vgpu_enabled_vm Skipped 0.04 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.04 test_deploy_vgpu_enabled_vm.py

Copy link
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

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

LGTM based on code review and test results

@rohityadavcloud
Copy link
Member

@pavanaravapalli please fix the conflicts

@rohityadavcloud rohityadavcloud added this to the 4.11 milestone Dec 10, 2017
@rohityadavcloud
Copy link
Member

@pavanaravapalli please rebase and fix conflicts

@pavan4smile
Copy link

pavan4smile commented Dec 12, 2017

@rhtyd ok I will do .

@rohityadavcloud
Copy link
Member

@pavanaravapalli can you fix the conflicts?

@pavan4smile
Copy link

@rhtyd rebased and fixed conflicts

@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1426

@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1497

@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1513

@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1553

@rohityadavcloud
Copy link
Member

@blueorangutan test centos7 xenserver-65sp1

@blueorangutan
Copy link

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + xenserver-65sp1) has been kicked to run smoke tests

@blueorangutan
Copy link

Trillian test result (tid-1989)
Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44129 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2149-t1989-xenserver-65sp1.zip
Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
Smoke tests completed. 67 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

@rohityadavcloud
Copy link
Member

Merging this based on code reviews and test results.

@rohityadavcloud rohityadavcloud merged commit 2adbaeb into apache:master Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants