Petr Horáček has uploaded a new change for review.

Change subject: Revert "Instruct MOM to ignore ballooning when guest agent is not running" ......................................................................

Revert "Instruct MOM to ignore ballooning when guest agent is not running"

This reverts commit a99bacf9562c686d585c9af99454e9647b14cc4e.

Change-Id: I2508225646cf9f86846a6c5975c5ca28168265f0 Signed-off-by: Petr Horáček phoracek@redhat.com --- M vdsm.spec.in M vdsm/mom.conf.in M vdsm/mom.d/02-balloon.policy 3 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/35558/1

diff --git a/vdsm.spec.in b/vdsm.spec.in index d15f5c2..59d31c1 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -137,7 +137,7 @@ Requires: libnl3 Requires: %{name}-xmlrpc = %{version}-%{release} Requires: %{name}-jsonrpc = %{version}-%{release} -Requires: mom >= 0.4.3 +Requires: mom >= 0.4.2 # Numactl is not available on s390[x] and ARM %ifnarch s390 s390x %{arm} Requires: numactl diff --git a/vdsm/mom.conf.in b/vdsm/mom.conf.in index 35d90a8..c850fff 100644 --- a/vdsm/mom.conf.in +++ b/vdsm/mom.conf.in @@ -71,4 +71,4 @@

[guest] # A comma-separated list of Collector plugins to use for Guest data collection. -collectors: GuestQemuProc, GuestMemoryOptional, GuestBalloon, GuestCpuTune +collectors: GuestQemuProc, GuestMemory, GuestBalloon, GuestCpuTune diff --git a/vdsm/mom.d/02-balloon.policy b/vdsm/mom.d/02-balloon.policy index 570c751..c98a231 100644 --- a/vdsm/mom.d/02-balloon.policy +++ b/vdsm/mom.d/02-balloon.policy @@ -108,17 +108,9 @@ # If the balloon is disabled, only deflate the balloon when possible

(defvar host_free_percent (/ (Host.StatAvg "mem_free") Host.mem_available)) - -(def balloon_logic (g) { - (if (and (< host_free_percent pressure_threshold) balloonEnabled) - (shrink_guest g) - (grow_guest g)) -}) - -(with Guests guest - (if (valid guest.balloon_cur (guest.StatAvg "mem_unused")) - (balloon_logic guest) - (debug "Memory information is missing, ballooning for" guest "disabled"))) +(if (and (< host_free_percent pressure_threshold) balloonEnabled) + (with Guests guest (shrink_guest guest)) + (with Guests guest (grow_guest guest)))

# # Balloon minimum guaranteed memory ruleset