CLOUDSTACK-1192: Disk I/O Statistics support KVM only util 20130625

ustcweizhou · ustcweizhou · commit 3bb4ec9f657b · 2013-06-26T11:10:11.000+02:00
diff --git a/api/src/com/cloud/vm/VmDiskStats.java b/api/src/com/cloud/vm/VmDiskStats.java
@@ -19,12 +19,12 @@
 public interface VmDiskStats {
     // vm related disk stats
 
-    public Long getIORead();
+    public long getIORead();
 
-    public Long getIOWrite();
+    public long getIOWrite();
     
-    public Long getBytesRead();
+    public long getBytesRead();
 
-    public Long getBytesWrite();
+    public long getBytesWrite();
 
 }
diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
@@ -22,15 +22,15 @@ public class VmDiskStatsEntry implements VmDiskStats {
 	
 	String vmName;
 	String path;
-	Long ioRead = 0L;
-	Long ioWrite = 0L;
-	Long bytesWrite = 0L;
-	Long bytesRead = 0L;
+	long ioRead = 0;
+	long ioWrite = 0;
+	long bytesWrite = 0;
+	long bytesRead = 0;
 	    
     public VmDiskStatsEntry() {
     }
     
-    public VmDiskStatsEntry(String vmName, String path, Long ioWrite, Long ioRead, Long bytesWrite, Long bytesRead) {
+    public VmDiskStatsEntry(String vmName, String path, long ioWrite, long ioRead, long bytesWrite, long bytesRead) {
         this.ioRead = ioRead;
         this.ioWrite = ioWrite;
         this.bytesRead = bytesRead;
@@ -55,35 +55,35 @@ public String getPath() {
         return path;
     }
     
-    public void setBytesRead(Long bytesRead) {
+    public void setBytesRead(long bytesRead) {
     	this.bytesRead = bytesRead;
     }
 
-    public Long getBytesRead() {
+    public long getBytesRead() {
     	return bytesRead;
     }
     
-    public void setBytesWrite(Long bytesWrite) {
+    public void setBytesWrite(long bytesWrite) {
     	this.bytesWrite = bytesWrite;
     }
     
-    public Long getBytesWrite() {
+    public long getBytesWrite() {
     	return bytesWrite;
     }
     
-    public void setIORead(Long ioRead) {
+    public void setIORead(long ioRead) {
         this.ioRead = ioRead;
     }
 
-    public Long getIORead() {
+    public long getIORead() {
         return ioRead;
     }
     
-    public void setIOWrite(Long ioWrite) {
+    public void setIOWrite(long ioWrite) {
         this.ioWrite = ioWrite;
     }
     
-    public Long getIOWrite() {
+    public long getIOWrite() {
         return ioWrite;
     }
 
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
@@ -65,6 +65,7 @@
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.resource.ResourceState;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePoolHostVO;
@@ -407,6 +408,7 @@ public void run() {
                 sc.addAnd("status", SearchCriteria.Op.EQ, Status.Up.toString());
                 sc.addAnd("resourceState", SearchCriteria.Op.NIN, ResourceState.Maintenance, ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance);
                 sc.addAnd("type", SearchCriteria.Op.EQ, Host.Type.Routing.toString());
+                sc.addAnd("hypervisorType", SearchCriteria.Op.EQ, HypervisorType.KVM); // support KVM only util 2013.06.25
                 List<HostVO> hosts = _hostDao.search(sc, null);
 
                 for (HostVO host : hosts) {
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3388,9 +3388,8 @@ public UserVm destroyVm(long vmId) throws ResourceUnavailableException,
 
     @Override
     public void collectVmDiskStatistics (UserVmVO userVm) {
-        // support KVM and XenServer only
-        if (!userVm.getHypervisorType().equals(HypervisorType.XenServer)
-                && !userVm.getHypervisorType().equals(HypervisorType.KVM))
+        // support KVM only util 2013.06.25
+        if (!userVm.getHypervisorType().equals(HypervisorType.KVM))
             return;        
     	// Collect vm disk statistics from host before stopping Vm
     	long hostId = userVm.getHostId();

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ public class VmDiskStatsEntry implements VmDiskStats {`
`22`	`22`
`23`	`23`	`String vmName;`
`24`	`24`	`String path;`
`25`		`- Long ioRead = 0L;`
`26`		`- Long ioWrite = 0L;`
`27`		`- Long bytesWrite = 0L;`
`28`		`- Long bytesRead = 0L;`
	`25`	`+ long ioRead = 0;`
	`26`	`+ long ioWrite = 0;`
	`27`	`+ long bytesWrite = 0;`
	`28`	`+ long bytesRead = 0;`
`29`	`29`
`30`	`30`	`public VmDiskStatsEntry() {`
`31`	`31`	`}`
`32`	`32`
`33`		`- public VmDiskStatsEntry(String vmName, String path, Long ioWrite, Long ioRead, Long bytesWrite, Long bytesRead) {`
	`33`	`+ public VmDiskStatsEntry(String vmName, String path, long ioWrite, long ioRead, long bytesWrite, long bytesRead) {`
`34`	`34`	`this.ioRead = ioRead;`
`35`	`35`	`this.ioWrite = ioWrite;`
`36`	`36`	`this.bytesRead = bytesRead;`
`@@ -55,35 +55,35 @@ public String getPath() {`
`55`	`55`	`return path;`
`56`	`56`	`}`
`57`	`57`
`58`		`- public void setBytesRead(Long bytesRead) {`
	`58`	`+ public void setBytesRead(long bytesRead) {`
`59`	`59`	`this.bytesRead = bytesRead;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public Long getBytesRead() {`
	`62`	`+ public long getBytesRead() {`
`63`	`63`	`return bytesRead;`
`64`	`64`	`}`
`65`	`65`
`66`		`- public void setBytesWrite(Long bytesWrite) {`
	`66`	`+ public void setBytesWrite(long bytesWrite) {`
`67`	`67`	`this.bytesWrite = bytesWrite;`
`68`	`68`	`}`
`69`	`69`
`70`		`- public Long getBytesWrite() {`
	`70`	`+ public long getBytesWrite() {`
`71`	`71`	`return bytesWrite;`
`72`	`72`	`}`
`73`	`73`
`74`		`- public void setIORead(Long ioRead) {`
	`74`	`+ public void setIORead(long ioRead) {`
`75`	`75`	`this.ioRead = ioRead;`
`76`	`76`	`}`
`77`	`77`
`78`		`- public Long getIORead() {`
	`78`	`+ public long getIORead() {`
`79`	`79`	`return ioRead;`
`80`	`80`	`}`
`81`	`81`
`82`		`- public void setIOWrite(Long ioWrite) {`
	`82`	`+ public void setIOWrite(long ioWrite) {`
`83`	`83`	`this.ioWrite = ioWrite;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public Long getIOWrite() {`
	`86`	`+ public long getIOWrite() {`
`87`	`87`	`return ioWrite;`
`88`	`88`	`}`
`89`	`89`