Maor Lipchuk has uploaded a new change for review. Change subject: core:Use proper percentage calculation for storage. ......................................................................
core:Use proper percentage calculation for storage. Calculate the storage free percentage space correctly, using double as return value. Related-to: https://bugzilla.redhat.com/856201 Change-Id: Ic9c03538a4c6173bd8eb5c0f35f665659afcff2d Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java 2 files changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/11404/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java index 0608c40..307711f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java @@ -64,15 +64,11 @@ this.usedDiskSize = value; } - public int getfreeDiskPercent() { - Integer usedDiskSizeObj = getused_disk_size(); - Integer availableDiskSizeObj = getavailable_disk_size(); - int usedDiskSize = usedDiskSizeObj == null ? 0 : usedDiskSizeObj; - int availableDiskSize = availableDiskSizeObj == null ? 0 : availableDiskSizeObj; - - int sum = usedDiskSize + availableDiskSize; - int val = (sum == 0) ? 0 : (100 - (usedDiskSize * 100) / sum); - return val; + public double getfreeDiskPercent() { + Integer usedDiskSize = getused_disk_size() == null ? 0 : getused_disk_size(); + Integer availableDiskSize = getavailable_disk_size() == null ? 0 : getavailable_disk_size(); + double totalSize = usedDiskSize + availableDiskSize; + return totalSize != 0 ? (availableDiskSize / totalSize) * (double) 100 : 0; } public int getfreeDiskInGB() { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 3e44df5..95e58f8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -359,7 +359,7 @@ || (domainPoolMap.getstatus() != StorageDomainStatus.InActive && data.getstatus() == StorageDomainStatus.Active)) { DbFacade.getInstance().getStorageDomainDynamicDao().update(data.getStorageDynamicData()); if (data.getavailable_disk_size() != null && data.getused_disk_size() != null) { - int freePercent = data.getStorageDynamicData().getfreeDiskPercent(); + double freePercent = data.getStorageDynamicData().getfreeDiskPercent(); int freeDiskInGB = data.getStorageDynamicData().getfreeDiskInGB(); AuditLogType type = AuditLogType.UNASSIGNED; boolean spaceThresholdMet = -- To view, visit http://gerrit.ovirt.org/11404 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9c03538a4c6173bd8eb5c0f35f665659afcff2d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
