Tomas Jelinek has uploaded a new change for review.
Change subject: engine: nullify EmulatedMachine field only on cluster level
change
......................................................................
engine: nullify EmulatedMachine field only on cluster level change
Change-Id: I8ffb180cfcd56c50b9bc228c0043e6fd5fee1c58
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/18898/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
index 2490bdf..a9cc4a9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
@@ -24,6 +24,7 @@
import org.ovirt.engine.core.common.businessentities.network.NetworkStatus;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.common.gluster.GlusterFeatureSupported;
+import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
@@ -53,6 +54,13 @@
protected void executeCommand() {
// TODO: This code should be revisited and proper compensation logic
should be introduced here
CheckMaxMemoryOverCommitValue();
+ if (!ObjectUtils.objectsEqual(oldGroup.getcompatibility_version(),
getParameters().getVdsGroup().getcompatibility_version())) {
+ // let the auto detection set the emulated machine up if the
cluster compatibility change
+ getParameters().getVdsGroup().setEmulatedMachine(null);
+ } else {
+
getParameters().getVdsGroup().setEmulatedMachine(oldGroup.getEmulatedMachine());
+ }
+
getVdsGroupDAO().update(getParameters().getVdsGroup());
if ((oldGroup.getStoragePoolId() != null
--
To view, visit http://gerrit.ovirt.org/18898
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ffb180cfcd56c50b9bc228c0043e6fd5fee1c58
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
