GitHub user ustcweizhou opened a pull request: https://github.com/apache/cloudstack/pull/1144
[4.6.1] CLOUDSTACK-9022: keep Destroyed volumes for sometime for now, the Destroyed volumes will be expunged in Storage cleanup thread, no matter when they are destroyed. In Expunging vm thread, we expunge the Destroyed vms which have been destroyed at least 'expunge.delay' seconds. We add the similar configuration for volumes. same to #1029 , this is for 4.6 You can merge this pull request into a Git repository by running: $ git pull https://github.com/ustcweizhou/cloudstack storage-cleanup-delay-4.6 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1144.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1144 ---- commit 12c395b56052af36901ab3ed1a366ed8985740eb Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2015-11-25T09:07:40Z CLOUDSTACK-9083: Add disk serial to kvm virt xml Adds disk serial ids based on volume uuids to the virt xml. This may be useful for appliances/software that needs some serial ids on the VM disks. This does not impact existing/running VMs, the vm virt xmls will be updates for running VMs the next time they are stopped/started. For testing, disk serial (of debian based systemvm) in the virt xml matched that in /sys/devices/pci0000:00:0000:00:07.0/virtio4/block/vda/serial. We currently don't support scsi-blcok devices for which serial is not supported, for this we've added a DeviceType (LUN) which may be used in future and a check to not add the serial to the xml if disk type is LUN. Refer: https://libvirt.org/formatdomain.html#elementsDisks Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit 1e67a5d2c89009daabdcded86e9844824ec7d1ed Author: Syed <syed1.mush...@gmail.com> Date: 2015-11-27T18:48:18Z Fix secondary storage not working with swift commit 6d4722953f859c537aadd2a0b4b5f3553f33dc69 Author: Milamber <milam...@apache.org> Date: 2015-11-29T19:01:56Z Update L10N resource files with 4.6 strings from Transifex (20151129) commit 7dcc6540e76db06fe51e8f33803260762ffaa826 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2015-11-30T09:40:31Z Merge pull request #1121 from shapeblue/4.6-cloudstack-9083 [4.6] CLOUDSTACK-9083: Add disk serial to kvm virt xmlAdds disk serial ids based on volume uuids to the virt xml. This may be useful for appliances/software that needs some serial ids on the VM disks. This does not impact existing/running VMs, the vm virt xmls will be updates for running VMs the next time they are stopped/started. For testing, disk serial (of debian based systemvm) in the virt xml matched that in /sys/devices/pci0000:00:0000:00:07.0/virtio4/block/vda/serial. We currently don't support scsi-blcok devices for which serial is not supported, for this we've added a DeviceType (LUN) which may be used in future and a check to not add the serial to the xml if disk type is LUN. Refer: https://libvirt.org/formatdomain.html#elementsDisks * pr/1121: CLOUDSTACK-9083: Add disk serial to kvm virt xml Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit df0797affd0bdec9f42a28fee6af5291d4528698 Author: Remi Bergsma <git...@remi.nl> Date: 2015-11-30T18:36:37Z Merge pull request #1133 from syed/4.6 Fix secondary storage not working with swiftOriginal PR and discussion at #1112 * pr/1133: Fix secondary storage not working with swift Signed-off-by: Remi Bergsma <git...@remi.nl> commit e675250f6068e76d422618f8a4467aea29c256a6 Author: Remi Bergsma <git...@remi.nl> Date: 2015-11-30T18:49:01Z Merge pull request #1138 from milamberspace/L10N-update-4.6-20151129 Update L10N resource files with 4.6 strings from Transifex (20151129)Small update of L10N files before the 4.6.1 release candidate cc @remibergsma * pr/1138: Update L10N resource files with 4.6 strings from Transifex (20151129) Signed-off-by: Remi Bergsma <git...@remi.nl> commit 9077c9a5b47224b2d00978ff67e9af6957ec589b Author: Wei Zhou <w.z...@tech.leaseweb.com> Date: 2015-11-03T16:04:55Z CLOUDSTACK-9022: keep Destroyed volumes for sometime commit 4ed1e0d5f809d1bb2845b6e076d55eeb1ce3f0f4 Author: Wei Zhou <w.z...@tech.leaseweb.com> Date: 2015-11-04T08:27:32Z CLOUDSTACK-9022: move storage.cleanup related global configurations to StorageManager ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---