Skip to content

CLOUDSTACK-9665 List hosts api does not report correct cpu and memory… #2120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karuturi merged 1 commit into from
May 19, 2017
Merged

CLOUDSTACK-9665 List hosts api does not report correct cpu and memory… #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ public class HostForMigrationResponse extends BaseResponse {
@Param(description = "the amount of the host's CPU after applying the cpu.overprovisioning.factor ")
private String cpuWithOverprovisioning;

@Deprecated
@SerializedName("memorytotal")
@Param(description = "the memory total of the host, this parameter is deprecated use memorywithoverprovisioning")
private Long memoryTotal;

@SerializedName("memorywithoverprovisioning")
@Param(description = "the amount of the host's memory after applying the mem.overprovisioning.factor ")
private String memWithOverprovisioning;

@SerializedName("averageload")
@Param(description = "the cpu average load on the host")
private Long averageLoad;
Expand All @@ -119,13 +128,9 @@ public class HostForMigrationResponse extends BaseResponse {
@Param(description = "the outgoing network traffic on the host")
private Long networkKbsWrite;

@SerializedName("memorytotal")
@Param(description = "the memory total of the host")
private Long memoryTotal;

@SerializedName("memoryallocated")
@Param(description = "the amount of the host's memory currently allocated")
private Long memoryAllocated;
private String memoryAllocated;

@SerializedName("memoryused")
@Param(description = "the amount of the host's memory currently used")
Expand Down Expand Up @@ -305,11 +310,7 @@ public void setNetworkKbsWrite(Long networkKbsWrite) {
this.networkKbsWrite = networkKbsWrite;
}

public void setMemoryTotal(Long memoryTotal) {
this.memoryTotal = memoryTotal;
}

public void setMemoryAllocated(Long memoryAllocated) {
public void setMemoryAllocated(String memoryAllocated) {
this.memoryAllocated = memoryAllocated;
}

Expand Down Expand Up @@ -401,11 +402,19 @@ public void setCpuWithOverprovisioning(String cpuWithOverprovisioning) {
this.cpuWithOverprovisioning = cpuWithOverprovisioning;
}

public void setMemWithOverprovisioning(String memWithOverprovisioning){
this.memWithOverprovisioning=memWithOverprovisioning;
}

public void setHypervisorVersion(String hypervisorVersion) {
this.hypervisorVersion = hypervisorVersion;
}

public void setHaHost(Boolean haHost) {
this.haHost = haHost;
}

public void setMemoryTotal(Long memoryTotal) {
this.memoryTotal = memoryTotal;
}
}
20 changes: 14 additions & 6 deletions api/src/org/apache/cloudstack/api/response/HostResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,18 @@ public class HostResponse extends BaseResponse {
@Param(description = "the outgoing network traffic on the host")
private Long networkKbsWrite;

@Deprecated
@SerializedName("memorytotal")
@Param(description = "the memory total of the host")
@Param(description = "the memory total of the host, this parameter is deprecated use memorywithoverprovisioning")
private Long memoryTotal;

@SerializedName("memorywithoverprovisioning")
@Param(description = "the amount of the host's memory after applying the mem.overprovisioning.factor")
private String memWithOverprovisioning;

@SerializedName("memoryallocated")
@Param(description = "the amount of the host's memory currently allocated")
private Long memoryAllocated;
private long memoryAllocated;

@SerializedName("memoryused")
@Param(description = "the amount of the host's memory currently used")
Expand Down Expand Up @@ -328,11 +333,11 @@ public void setNetworkKbsWrite(Long networkKbsWrite) {
this.networkKbsWrite = networkKbsWrite;
}

public void setMemoryTotal(Long memoryTotal) {
this.memoryTotal = memoryTotal;
public void setMemWithOverprovisioning(String memWithOverprovisioning){
this.memWithOverprovisioning=memWithOverprovisioning;
}

public void setMemoryAllocated(Long memoryAllocated) {
public void setMemoryAllocated(long memoryAllocated) {
this.memoryAllocated = memoryAllocated;
}

Expand Down Expand Up @@ -458,6 +463,9 @@ public void setDetails(Map details) {

}

public void setMemoryTotal(Long memoryTotal) {
this.memoryTotal = memoryTotal;
}
public String getName() {
return name;
}
Expand Down Expand Up @@ -542,7 +550,7 @@ public Long getMemoryTotal() {
return memoryTotal;
}

public Long getMemoryAllocated() {
public long getMemoryAllocated() {
return memoryAllocated;
}

Expand Down
13 changes: 8 additions & 5 deletions server/src/com/cloud/api/ApiDBUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.uservm.UserVm;
import com.cloud.utils.EnumUtils;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.DomainRouterVO;
Expand Down Expand Up @@ -1275,10 +1274,14 @@ public static Long getDedicatedNetworkDomain(long networkId) {
return s_networkModel.getDedicatedNetworkDomain(networkId);
}

public static float getCpuOverprovisioningFactor() {
String opFactor = s_configDao.getValue(CapacityManager.CpuOverprovisioningFactorCK);
float cpuOverprovisioningFactor = NumbersUtil.parseFloat(opFactor, 1);
return cpuOverprovisioningFactor;
public static float getCpuOverprovisioningFactor(long clusterId) {
float opFactor = CapacityManager.CpuOverprovisioningFactor.valueIn(clusterId);
return opFactor;
}

public static float getMemOverprovisioningFactor(long clusterId) {
float opFactor = CapacityManager.MemOverprovisioningFactor.valueIn(clusterId);
return opFactor;
}

public static boolean isExtractionDisabled() {
Expand Down
22 changes: 13 additions & 9 deletions server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
Long mem = host.getMemReservedCapacity() + host.getMemUsedCapacity();
Long cpu = host.getCpuReservedCapacity() + host.getCpuUsedCapacity();

hostResponse.setMemoryTotal(mem);
Float totalMemorywithOverprovisioning=new Float((host.getTotalMemory()*ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId())));
hostResponse.setMemWithOverprovisioning(totalMemorywithOverprovisioning.toString());
Copy link
Contributor

@syed syed Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey guys,

Looks like there is a flaw with the logic. We have a cluster of XenServer hosts with 512 GB of RAM and the UI shows ~170 GB of RAM. This is not even including the overprovisioning factor. Can you please check the logic around here

here getMemReservedCapacity is for most cases 0 which leads to mem = host.getMemUsedCapacity() and later hostResponse.setMemoryTotal(mem) which is wrong. Can you please explain the logic here? @bvbharatk @karuturi ?

Copy link
Contributor

@pdion891 pdion891 Jul 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jira ticket created: https://issues.apache.org/jira/browse/CLOUDSTACK-10001

Copy link
Member

@karuturi karuturi Sep 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@syed I agree. I think this should just be hostResponse.setMemoryTotal(host.getTotalMemory());

hostResponse.setMemoryAllocated(mem);
hostResponse.setMemoryTotal(host.getTotalMemory());

String hostTags = host.getTag();
hostResponse.setHostTags(host.getTag());
Expand All @@ -173,10 +175,10 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail

hostResponse.setHypervisorVersion(host.getHypervisorVersion());

String cpuAlloc = decimalFormat.format(((float)cpu / (float)(host.getCpus() * host.getSpeed())) * 100f) + "%";
Float cpuWithOverprovisioning = new Float(host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()));
String cpuAlloc = decimalFormat.format(((float)cpu / cpuWithOverprovisioning * 100f)) + "%";
hostResponse.setCpuAllocated(cpuAlloc);
String cpuWithOverprovisioning = new Float(host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor()).toString();
hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioning);
hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioning.toString());
}

if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {
Expand Down Expand Up @@ -297,8 +299,10 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu
Long mem = host.getMemReservedCapacity() + host.getMemUsedCapacity();
Long cpu = host.getCpuReservedCapacity() + host.getCpuReservedCapacity();

hostResponse.setMemoryAllocated(mem);
hostResponse.setMemoryTotal(host.getTotalMemory());
hostResponse.setMemoryTotal(mem);
Copy link
Contributor

@ustcweizhou ustcweizhou Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this also needs to be fixed.

Float memWithOverprovisioning =new Float((host.getTotalMemory()*ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId())));
hostResponse.setMemWithOverprovisioning(memWithOverprovisioning.toString());
hostResponse.setMemoryAllocated(decimalFormat.format((float)mem/ memWithOverprovisioning*100f).toString()+"%");

String hostTags = host.getTag();
hostResponse.setHostTags(host.getTag());
Expand All @@ -316,10 +320,10 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu

hostResponse.setHypervisorVersion(host.getHypervisorVersion());

String cpuAlloc = decimalFormat.format(((float)cpu / (float)(host.getCpus() * host.getSpeed())) * 100f) + "%";
Float cpuWithOverprovisioning = new Float(host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()));
String cpuAlloc = decimalFormat.format(((float)cpu / cpuWithOverprovisioning * 100f)).toString() + "%";
hostResponse.setCpuAllocated(cpuAlloc);
String cpuWithOverprovisioning = new Float(host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor()).toString();
hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioning);
hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioning.toString());
}

if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {
Expand Down