etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.9 to master 

* 4.9:
  CLOUDSTACK-9900: Fix high CPU deviation issues seen in metrics view
This commit is contained in:
Rajani Karuturi 2017-05-16 12:44:53 +05:30
parent 86eb5683dd d710b551bc
commit 9b605b1a72
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/metrics/src/org/apache/cloudstack/response/ClusterMetricsResponse.java
View File

@ -128,10 +128,10 @@ public class ClusterMetricsResponse extends ClusterResponse {
}
}
public void setCpuMaxDeviation(final Double maxCpuDeviation, final Double totalCpuUsed, final Long totalHosts) {
if (maxCpuDeviation != null && totalCpuUsed != null && totalHosts != null && totalHosts != 0) {
final Double averageCpuUsage = totalCpuUsed / totalHosts;
this.cpuMaxDeviation = String.format("%.2f%%", (maxCpuDeviation - averageCpuUsage) * 100.0 / averageCpuUsage);
public void setCpuMaxDeviation(final Double maxCpuUsagePercentage, final Double totalCpuUsedPercentage, final Long totalHosts) {
if (maxCpuUsagePercentage != null && totalCpuUsedPercentage != null && totalHosts != null && totalHosts != 0) {
final Double averageCpuUsagePercentage = totalCpuUsedPercentage / totalHosts;
this.cpuMaxDeviation = String.format("%.2f%%", (maxCpuUsagePercentage - averageCpuUsagePercentage) / averageCpuUsagePercentage);
}
}

8
plugins/metrics/src/org/apache/cloudstack/response/ZoneMetricsResponse.java
View File

@ -123,10 +123,10 @@ public class ZoneMetricsResponse extends ZoneResponse {
}
}
public void setCpuMaxDeviation(final Double maxCpuDeviation, final Double totalCpuUsed, final Long totalHosts) {
if (maxCpuDeviation != null && totalCpuUsed != null && totalHosts != null && totalHosts != 0) {
final Double averageCpuUsage = totalCpuUsed / totalHosts;
this.cpuMaxDeviation = String.format("%.2f%%", (maxCpuDeviation - averageCpuUsage) * 100.0 / averageCpuUsage);
public void setCpuMaxDeviation(final Double maxCpuUsagePercentage, final Double totalCpuUsedPercentage, final Long totalHosts) {
if (maxCpuUsagePercentage != null && totalCpuUsedPercentage != null && totalHosts != null && totalHosts != 0) {
final Double averageCpuUsagePercentage = totalCpuUsedPercentage / totalHosts;
this.cpuMaxDeviation = String.format("%.2f%%", (maxCpuUsagePercentage - averageCpuUsagePercentage) / averageCpuUsagePercentage);
}
}