You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/17 06:42:56 UTC
[1/2] git commit: updated refs/heads/master to bf2f441
Repository: cloudstack
Updated Branches:
refs/heads/master 12497d04b -> bf2f44121
CLOUDSTACK-9752: [Vmware] Optimization of volume attachness to vm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/49dadc55
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/49dadc55
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/49dadc55
Branch: refs/heads/master
Commit: 49dadc5505d85323b0864f50a2a8e36dd05805e5
Parents: e02003d
Author: nvazquez <ni...@gmail.com>
Authored: Fri Jan 20 13:20:37 2017 -0300
Committer: nvazquez <ni...@gmail.com>
Committed: Fri Feb 10 11:02:44 2017 -0300
----------------------------------------------------------------------
.../storage/resource/VmwareStorageProcessor.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49dadc55/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index e790d47..1d33b16 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1577,11 +1577,15 @@ public class VmwareStorageProcessor implements StorageProcessor {
}
synchronized (this) {
- // s_logger.info("Delete file if exists in datastore to clear the way for creating the volume. file: " + volumeDatastorePath);
- VmwareStorageLayoutHelper.deleteVolumeVmdkFiles(dsMo, volumeUuid.toString(), dcMo);
-
- vmMo.createDisk(volumeDatastorePath, (int)(volume.getSize() / (1024L * 1024L)), morDatastore, vmMo.getScsiDeviceControllerKey());
- vmMo.detachDisk(volumeDatastorePath, false);
+ try {
+ vmMo.createDisk(volumeDatastorePath, (int)(volume.getSize() / (1024L * 1024L)), morDatastore, vmMo.getScsiDeviceControllerKey());
+ vmMo.detachDisk(volumeDatastorePath, false);
+ }
+ catch (Exception e) {
+ s_logger.error("Deleting file " + volumeDatastorePath + " due to error: " + e.getMessage());
+ VmwareStorageLayoutHelper.deleteVolumeVmdkFiles(dsMo, volumeUuid.toString(), dcMo);
+ throw new CloudRuntimeException("Unable to create volume due to: " + e.getMessage());
+ }
}
VolumeObjectTO newVol = new VolumeObjectTO();
[2/2] git commit: updated refs/heads/master to bf2f441
Posted by ra...@apache.org.
Merge pull request #1913 from nvazquez/createVolumeOptimization
CLOUDSTACK-9752: [Vmware] Optimization of volume attachness to vm## Description
This optimization aims to reduce volume attach slowness due to vmdk files search on datastore before creating the volume (search for `.vmdk`, `-flat.vmdk` and `-delta.vmdk` files to delete them if they exist). This search is not necessary when attaching a volume in Allocated state, due to volume files don't exist on datastore.
On large datastores, this search can cause volume attachness to be really slow, as we can see in this log lines:
````
13-mgmt.log:2016-11-02 10:16:33,136 INFO [vmware.mo.DatastoreMO] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Searching file 9ce7731fd38b4045afbb7ce9754abbc1.vmdk in [b5ebda046d613e079b5874b169cd848f]
13-mgmt.log:2016-11-02 10:19:42,567 WARN [storage.resource.VmwareStorageLayoutHelper] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Unable to locate VMDK file: 9ce7731fd38b4045afbb7ce9754abbc1.vmdk
13-mgmt.log:2016-11-02 10:19:42,719 INFO [vmware.mo.DatastoreMO] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Search file 9ce7731fd38b4045afbb7ce9754abbc1-flat.vmdk on [b5ebda046d613e079b5874b169cd848f]
13-mgmt.log:2016-11-02 10:19:44,399 INFO [vmware.mo.DatastoreMO] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Searching file 9ce7731fd38b4045afbb7ce9754abbc1-flat.vmdk in [b5ebda046d613e079b5874b169cd848f]
13-mgmt.log:2016-11-02 10:22:07,581 WARN [storage.resource.VmwareStorageLayoutHelper] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Unable to locate VMDK file: 9ce7731fd38b4045afbb7ce9754abbc1-flat.vmdk
13-mgmt.log:2016-11-02 10:22:07,731 INFO [vmware.mo.DatastoreMO] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Search file 9ce7731fd38b4045afbb7ce9754abbc1-delta.vmdk on [b5ebda046d613e079b5874b169cd848f]
13-mgmt.log:2016-11-02 10:22:09,745 INFO [vmware.mo.DatastoreMO] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Searching file 9ce7731fd38b4045afbb7ce9754abbc1-delta.vmdk in [b5ebda046d613e079b5874b169cd848f]
13-mgmt.log:2016-11-02 10:25:06,362 WARN [storage.resource.VmwareStorageLayoutHelper] (DirectAgent-931:ctx-5687d68e uscrlpdcsesx240.ads.autodesk.com, job-8675314/job-8675315, cmd: CreateObjectCommand) Unable to locate VMDK file: 9ce7731fd38b4045afbb7ce9754abbc1-delta.vmdk
````
* pr/1913:
CLOUDSTACK-9752: [Vmware] Optimization of volume attachness to vm
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf2f4412
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf2f4412
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf2f4412
Branch: refs/heads/master
Commit: bf2f441211f84b8e6f010a187b3691cbf22fd79e
Parents: 12497d0 49dadc5
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Feb 17 12:12:36 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Feb 17 12:12:37 2017 +0530
----------------------------------------------------------------------
.../storage/resource/VmwareStorageProcessor.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------