cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [4/6] git commit: updated refs/heads/4.2 to 2fc1161
Date Fri, 29 Nov 2013 10:18:38 GMT
CLOUDSTACK-5293: get vm disk statistics only from DISK (not for ISO/FLOPPY)
(cherry picked from commit d473d5a36a4c50793988081a52b602d58d95f302)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cada5dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cada5dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cada5dd

Branch: refs/heads/4.2
Commit: 5cada5ddf2a4b80f1d9d9d25ad85350e3f0d3200
Parents: 3a3ed76
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Thu Nov 28 10:47:51 2013 +0100
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Fri Nov 29 11:18:01 2013 +0100

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cada5dd/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 182cb22..dfb5fba 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -197,6 +197,7 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuModeDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuTuneDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DevicesDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.deviceType;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.diskProtocol;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.FeaturesDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.FilesystemDef;
@@ -4733,6 +4734,8 @@ ServerResource {
             List<DiskDef> disks = getDisks(conn, vmName);
 
             for (DiskDef disk : disks) {
+                if (disk.getDeviceType() != deviceType.DISK)
+                    break;
                 DomainBlockStats blockStats = dm.blockStats(disk.getDiskLabel());
                 String path = disk.getDiskPath(); // for example, path = /mnt/pool_uuid/disk_path/
                 String diskPath = null;


Mime
View raw message