From dfd59321b16474048b43224f2bfe1133d080249d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 30 Oct 2020 09:38:59 +0100 Subject: [PATCH] server: fix format error with memorywithoverprovisioning in list hosts response (#4435) --- .../java/com/cloud/api/query/dao/HostJoinDaoImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java index 597cc1ca446..8b4220c8838 100644 --- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -171,7 +171,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements hostResponse.setMemoryTotal(host.getTotalMemory()); Float totalMemorywithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId()); - hostResponse.setMemWithOverprovisioning(totalMemorywithOverprovisioning.toString()); + hostResponse.setMemWithOverprovisioning(decimalFormat.format(totalMemorywithOverprovisioning)); hostResponse.setMemoryAllocated(mem); String hostTags = host.getTag(); @@ -192,7 +192,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()); hostResponse.setCpuAllocated(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning)); - hostResponse.setCpuWithOverprovisioning(Float.toString(cpuWithOverprovisioning)); + hostResponse.setCpuWithOverprovisioning(decimalFormat.format(cpuWithOverprovisioning)); } if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) { @@ -320,7 +320,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements hostResponse.setMemoryTotal(host.getTotalMemory()); Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId()); - hostResponse.setMemWithOverprovisioning(memWithOverprovisioning.toString()); + hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning)); hostResponse.setMemoryAllocated(decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%"); String hostTags = host.getTag(); @@ -341,7 +341,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()); hostResponse.setCpuAllocated(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning)); - hostResponse.setCpuWithOverprovisioning(Float.toString(cpuWithOverprovisioning)); + hostResponse.setCpuWithOverprovisioning(decimalFormat.format(cpuWithOverprovisioning)); } if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {