Arik Hadas has uploaded a new change for review. Change subject: core: fixing committed memory ......................................................................
core: fixing committed memory Change-Id: I04be4ca80456ffbf47af2f883a33672166c25cb6 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/25943/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 4b9579d..a5f9a2b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -932,6 +932,7 @@ } if (fetchRunningVms()) { + refreshCommitedMemory(); List<Guid> staleRunningVms = checkVmsStatusChanged(); proceedWatchdogEvents(); @@ -952,7 +953,6 @@ // checking the db for incoherent vm status; // setVmStatusDownForVmNotFound(); - refreshCommitedMemory(); // Handle VM devices were changed (for 3.1 cluster and above) if (!VmDeviceCommonUtils.isOldClusterVersion(_vds.getVdsGroupCompatibilityVersion())) { handleVmDeviceChange(); @@ -1912,10 +1912,12 @@ private void refreshCommitedMemory() { Integer memCommited = _vds.getGuestOverhead(); int vmsCoresCount = 0; - for (VM vm : _vmDict.values()) { + for (Guid vmId : _runningVms.keySet()) { + VM vm = _vmDict.get(vmId); // VMs' pending resources are cleared in powering up, so in launch state // we shouldn't include them as committed. - if (vm.getStatus() != VMStatus.WaitForLaunch) { + if (vm.getStatus() != VMStatus.WaitForLaunch && + vm.getStatus() != VMStatus.Down) { memCommited += vm.getVmMemSizeMb(); memCommited += _vds.getGuestOverhead(); vmsCoresCount += vm.getNumOfCpus(); -- To view, visit http://gerrit.ovirt.org/25943 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04be4ca80456ffbf47af2f883a33672166c25cb6 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
