Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BA6A101E5 for ; Sat, 1 Jun 2013 06:17:57 +0000 (UTC) Received: (qmail 15808 invoked by uid 500); 1 Jun 2013 06:17:56 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 15379 invoked by uid 500); 1 Jun 2013 06:17:54 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 14250 invoked by uid 99); 1 Jun 2013 06:17:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jun 2013 06:17:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1B2EB89F193; Sat, 1 Jun 2013 06:17:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: weizhou@apache.org To: commits@cloudstack.apache.org Date: Sat, 01 Jun 2013 06:17:42 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: updated refs/heads/disk_io_stat to 65a886d Updated Branches: refs/heads/disk_io_stat 385ca81e0 -> 65a886de5 refs/heads/master 8deeb90a6 -> 6dad8adf8 Revert "CLOUDSTACK-1192: add RBD support" This reverts commit 385ca81e01754f0f65c18d32f0d35b41616498ac. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65a886de Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65a886de Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65a886de Branch: refs/heads/disk_io_stat Commit: 65a886de5d45bb6df806ad59de618b586aaba4c5 Parents: 385ca81 Author: Wei Zhou Authored: Fri May 31 11:18:48 2013 +0200 Committer: Wei Zhou Committed: Fri May 31 11:18:48 2013 +0200 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 23 ++++++--------- 1 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65a886de/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 d402c61..46fce24 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 @@ -189,7 +189,6 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ConsoleDef; 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; @@ -4550,19 +4549,15 @@ ServerResource { List disks = getDisks(conn, vmName); for (DiskDef disk : disks) { - if (disk.getDeviceType().equals(deviceType.DISK)) { - DomainBlockStats blockStats = dm.blockStats(disk.getDiskLabel()); - String path = disk.getDiskPath(); - String diskPath = null; - if (path != null) { - if (path.startsWith("rbd:")) // path = rbd:/mnt/pool_uuid/disk_path/ - path = path.replace("rbd:", ""); - String[] token = path.split("/"); // path = /mnt/pool_uuid/disk_path/ - if (token.length > 3) { - diskPath = token[3]; - VmDiskStatsEntry stat = new VmDiskStatsEntry(vmName, diskPath, blockStats.wr_req, blockStats.rd_req, blockStats.wr_bytes, blockStats.rd_bytes); - stats.add(stat); - } + DomainBlockStats blockStats = dm.blockStats(disk.getDiskLabel()); + String path = disk.getDiskPath(); // for example, path = /mnt/pool_uuid/disk_path/ + String diskPath = null; + if (path != null) { + String[] token = path.split("/"); + if (token.length > 3) { + diskPath = token[3]; + VmDiskStatsEntry stat = new VmDiskStatsEntry(vmName, diskPath, blockStats.wr_req, blockStats.rd_req, blockStats.wr_bytes, blockStats.rd_bytes); + stats.add(stat); } } }