Vitor de Lima has uploaded a new change for review. Change subject: core, engine: Temporarily disable CPU pinning validation ......................................................................
core, engine: Temporarily disable CPU pinning validation This patch disables the validation responsible for checking if a physical CPU exists during the verification of CPU pinning settings. This is needed in ppc64 due to the lack of a list of which CPUs are online, something that is correctly reported currently only in x86-64. As soon as this missing info is fixed in ppc64, this patch can reverted. Change-Id: I98c7a2f136b278a7a695bae8b2eadd3658f3e65c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1148092 Signed-off-by: Vitor de Lima <vdel...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java 2 files changed, 0 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/35760/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java index aa05d8b..9719c9c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.bll; import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -24,7 +23,6 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.Version; public class VmManagementCommandBase<T extends VmManagementParametersBase> extends VmCommand<T> { @@ -163,25 +161,6 @@ if (currPcpus.size() == 0) { // definition of pcpus is no cpu, e.g 0#1,^1 return failCanDoAction(VdcBllMessages.VM_PINNING_PINNED_TO_NO_CPU); - } - - // check only from cluster version 3.2 - if (dedicatedVds.getVdsGroupCompatibilityVersion() != null && - dedicatedVds.getVdsGroupCompatibilityVersion().compareTo(Version.v3_2) >= 0) { - - if (dedicatedVds.getOnlineCpus() != null) { - for (Integer pCPU : currPcpus) { - if (!onlinePcpus.contains(pCPU)) { - // ERROR maps to a non existent or offline pcpu - return failCanDoAction(VdcBllMessages.VM_PINNING_PCPU_DOES_NOT_EXIST); - } - } - } else if (dedicatedVds.getCpuThreads() != null) { - if (Collections.max(currPcpus) >= dedicatedVds.getCpuThreads()) { - // ERROR maps to a non existent pcpu - return failCanDoAction(VdcBllMessages.VM_PINNING_PCPU_DOES_NOT_EXIST); - } - } } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java index 5ed1709..efa7b78 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java @@ -119,28 +119,6 @@ if (canDoActionMessages.size() > 0) { Assert.assertEquals(VdcBllMessages.VM_PINNING_VCPU_DOES_NOT_EXIST.toString(), canDoActionMessages.get(0)); } - canDoActionMessages.clear(); - Assert.assertFalse(test.isCpuPinningValid("10#1,2,3_11#1-20,^3", vmStatic)); - Assert.assertTrue(canDoActionMessages.size() > 0); - if (canDoActionMessages.size() > 0) { - Assert.assertEquals(VdcBllMessages.VM_PINNING_PCPU_DOES_NOT_EXIST.toString(), canDoActionMessages.get(0)); - } - - // additional tests for CPUs disabled on-the-fly - dedicatedVds.setOnlineCpus("0,1,2,4,5,6,7,8,9,10,11,12,13,14,15"); - - Assert.assertFalse("use of disabled cpu", test.isCpuPinningValid("0#3", vmStatic)); - Assert.assertTrue(canDoActionMessages.size() > 0); - if (canDoActionMessages.size() > 0) { - Assert.assertEquals(VdcBllMessages.VM_PINNING_PCPU_DOES_NOT_EXIST.toString(), canDoActionMessages.get(0)); - } - - // additional tests for CPUs disabled on-the-fly - dedicatedVds.setOnlineCpus("0,4,8,16,24,32,40,48,56,64,68,72,76,80,84"); - - Assert.assertTrue("use of cpu with a id larger than the number of CPU threads", - test.isCpuPinningValid("0#84", vmStatic)); - // making sure cluster < 3.2 does not get validated on pCPU as we cant tell the number for sure dedicatedVds.setVdsGroupCompatibilityVersion(Version.v3_1); Assert.assertTrue(test.isCpuPinningValid("10#1,2,3_11#1-20,^3", vmStatic)); -- To view, visit http://gerrit.ovirt.org/35760 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98c7a2f136b278a7a695bae8b2eadd3658f3e65c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Vitor de Lima <vdel...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
