Change in ovirt-engine[master]: core: Fix of merging of VmDynamics form DB and VDSM

[ahadas at redhat.com]

Arik Hadas has submitted this change and it was merged.

Change subject: core: Fix of merging of VmDynamics form DB and VDSM
......................................................................


core: Fix of merging of VmDynamics form DB and VDSM

Method VM.updateRunTimeDynamicData() only added new elemnts of property
graphicsInfos instead of completely accepting new value.

This caused inconsistency between vm_device (type graphics) and
vm_dynamic (spice_*, vnc_*) tables.

Now runtime info (`this`) is updated according to VDSM info (method
parameter `vm`). It allows to remove graphicsInfo entry. E.g. if
runtime info contains 'SPICE+VNC' and VDSM reports only 'VNC', the
runtime info is updated to 'VNC' whereas previous code erroneously kept
'SPICE+VNC'.

Graphics info upgrade script doesn't update vm_dynamic content table
any more. Proper values will be automaticall inserted during first VDSM
poll. Removed updated queries could introduce wrong grapnics info in
vm_dynamic table if VM was started using 'Run Once' with changed
graphics protocol.

Change-Id: If835f2502bc37d1d94ceea92879d2b3e7bf5f95f
Bug-Url: https://bugzilla.redhat.com/1297404
Signed-off-by: Jakub Niedermertl <jniederm at redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M packaging/dbscripts/upgrade/03_06_0590_add_graphics_info_columns.sql
2 files changed, 1 insertion(+), 14 deletions(-)

Approvals:
  Jakub Niedermertl: Verified
  Jenkins CI: Passed CI tests
  Arik Hadas: Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/51870
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If835f2502bc37d1d94ceea92879d2b3e7bf5f95f
Gerrit-PatchSet: 7
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jakub Niedermertl <jniederm at redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marek Libra <mlibra at redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek at redhat.com>
Gerrit-Reviewer: Michal Skrivanek <mskrivan at redhat.com>
Gerrit-Reviewer: Shmuel Leib Melamud <smelamud at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>