Xiaolei Shi has uploaded a new change for review. Change subject: core: need vds id when build vm numa properties ......................................................................
core: need vds id when build vm numa properties Change-Id: I19be54812d0ebbb54145f33e6b036af84ff1d8ae Bug-Url: https://bugzilla.redhat.com/1098539 Signed-off-by: Bruce Shi <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/27830/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java index 28638fa..26ba15b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java @@ -77,6 +77,7 @@ builder.buildVmVirtioScsi(); builder.buildUnmanagedDevices(); builder.buildVmSerialNumber(); + builder.buildVmNumaProperties(getParameters().getVdsId()); } private static final Log log = LogFactory.getLog(CreateVDSCommand.class); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java index 52f874c..44d70fc 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java @@ -147,7 +147,6 @@ } createInfo.put(VdsProperties.transparent_huge_pages, vm.isTransparentHugePages() ? "true" : "false"); - addNumaSetting(compatibilityVersion); } private void addCpuPinning(final String compatibilityVersion) { @@ -170,14 +169,15 @@ * have almost the same libvirt version support * * @param compatibilityVersion + * @param vdsId the vds id which the vm plan to run */ - private void addNumaSetting(final String compatibilityVersion) { + private void addNumaSetting(final String compatibilityVersion, final Guid vdsId) { if (Boolean.TRUE.equals(Config.<Boolean> getValue(ConfigValues.CpuPinningEnabled, compatibilityVersion))) { NumaTuneMode numaTune = vm.getNumaTuneMode() == null ? NumaTuneMode.PREFERRED : vm.getNumaTuneMode(); List<VmNumaNode> vmNumaNodes = DbFacade.getInstance().getVmNumaNodeDAO().getAllVmNumaNodeByVmId(vm.getId()); List<VdsNumaNode> totalVdsNumaNodes = DbFacade.getInstance().getVdsNumaNodeDAO() - .getAllVdsNumaNodeByVdsId(vm.getRunOnVds()); + .getAllVdsNumaNodeByVdsId(vdsId); List<Integer> totalVdsNumaNodesIndexes = NumaUtils.getNodeIndexList(totalVdsNumaNodes); Map<String, Object> createNumaTune = new HashMap<>(2); createNumaTune.put(VdsProperties.NUMA_TUNE_MODE, numaTune.getValue()); @@ -417,4 +417,9 @@ } return vdsGroup; } + + protected void buildVmNumaProperties(Guid vdsId) { + final String compatibilityVersion = vm.getVdsGroupCompatibilityVersion().toString(); + addNumaSetting(compatibilityVersion, vdsId); + } } -- To view, visit http://gerrit.ovirt.org/27830 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19be54812d0ebbb54145f33e6b036af84ff1d8ae Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Xiaolei Shi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
