Dudi Maroshi has uploaded a new change for review. Change subject: engine: Add KSM policy to NUMA hosts ......................................................................
engine: Add KSM policy to NUMA hosts Fix skipped code, while rebase in patch https://gerrit.ovirt.org/#/c/39783/ from patch-set 11 to 12, patch-set 12 had an erronous rebase. Fix code formatting Change-Id: Ie1ca6cee6d8c6cc2cc57e0dd14231560dc382be0 Bug-Url: https://bugzilla.redhat.com/840114 Signed-off-by: Dudi Maroshi <d...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/42376/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index 54bc2e4..55e4dfc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -68,7 +68,6 @@ import org.ovirt.engine.core.common.vdscommands.MomPolicyVDSParameters; import org.ovirt.engine.core.common.vdscommands.UpdateVmPolicyVDSParams; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.TransactionScopeOption; import org.ovirt.engine.core.compat.Version; diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java index 1cd08c3..5aa116a 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java @@ -167,8 +167,13 @@ model.setOptionalReason(entity.isOptionalReasonRequired()); model.setMaintenanceReasonRequired(entity.isMaintenanceReasonRequired()); model.setBallooningEnabled(entity.isEnableBallooning()); - model.setKsm(new KSM()); - model.getKsm().setEnabled(entity.isEnableKsm()); + KSM ksm = model.getKsm(); + if (ksm == null) { + ksm = new KSM(); + model.setKsm(ksm); + } + ksm.setEnabled(entity.isEnableKsm()); + ksm.setMergeAcrossNodes(entity.isKsmMergeAcrossNumaNodes()); if (StringUtils.isNotBlank(entity.getSpiceProxy())) { Display display = new Display(); display.setProxy(entity.getSpiceProxy()); -- To view, visit https://gerrit.ovirt.org/42376 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1ca6cee6d8c6cc2cc57e0dd14231560dc382be0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Dudi Maroshi <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
