Arik Hadas has uploaded a new change for review. Change subject: core: simplify ImportVmCommand#computeMinAllocatedMem ......................................................................
core: simplify ImportVmCommand#computeMinAllocatedMem Change-Id: I5e0c315f9a6ce90c1efab40e4bd72233231a6b5e Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/32384/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index f017fe3..90d2ef1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -1041,18 +1041,16 @@ } private int computeMinAllocatedMem() { - int vmMem = getVm().getMemSizeMb(); - int minAllocatedMem = vmMem; if (getVm().getMinAllocatedMem() > 0) { - minAllocatedMem = getVm().getMinAllocatedMem(); - } else { - // first get cluster memory over commit value - VDSGroup vdsGroup = getVdsGroup(); - if (vdsGroup != null && vdsGroup.getmax_vds_memory_over_commit() > 0) { - minAllocatedMem = (vmMem * 100) / vdsGroup.getmax_vds_memory_over_commit(); - } + return getVm().getMinAllocatedMem(); } - return minAllocatedMem; + + VDSGroup vdsGroup = getVdsGroup(); + if (vdsGroup != null && vdsGroup.getmax_vds_memory_over_commit() > 0) { + return (getVm().getMemSizeMb() * 100) / vdsGroup.getmax_vds_memory_over_commit(); + } + + return getVm().getMemSizeMb(); } private void logImportEvents() { -- To view, visit http://gerrit.ovirt.org/32384 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e0c315f9a6ce90c1efab40e4bd72233231a6b5e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
