Jiří Moskovčák has uploaded a new change for review. Change subject: core: fixed NPE when vdsm returns emtpy balloon info ......................................................................
core: fixed NPE when vdsm returns emtpy balloon info Change-Id: I27e7d3eacfa2807e9f4b058473ae898956dabb01 Bug-Url: https://bugzilla.redhat.com/1171491 Signed-off-by: Jiri Moskovcak <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmAnalyzer.java 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/36016/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmAnalyzer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmAnalyzer.java index 1ae1175..6423a8c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmAnalyzer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmAnalyzer.java @@ -331,13 +331,17 @@ private void proceedBalloonCheck() { if (getVdsManager().getCopyVds().isBalloonEnabled()) { VmBalloonInfo balloonInfo = vdsmVm.getVmStatistics().getVmBalloonInfo(); - Guid vmId = vdsmVm.getVmDynamic().getId(); - if (dbVm == null) { + + /* first time we check or we're not getting the balloon info + from vdsm rhbz#1171491 + */ + if (balloonInfo.getBalloonLastMemory() == null) { + balloonInfo.setBalloonLastMemory(balloonInfo.getCurrentMemory()); return; } - if (balloonInfo.getBalloonLastMemory() == 0) { // first time we check, so we don't have enough data yet - balloonInfo.setBalloonLastMemory(balloonInfo.getCurrentMemory()); + Guid vmId = vdsmVm.getVmDynamic().getId(); + if (dbVm == null) { return; } -- To view, visit http://gerrit.ovirt.org/36016 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27e7d3eacfa2807e9f4b058473ae898956dabb01 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jiří Moskovčák <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
