Roy Golan has uploaded a new change for review. Change subject: core: [monitoring] process hardware caps before software ......................................................................
core: [monitoring] process hardware caps before software Change-Id: I7b0b7ff7d751c3c617f6ac1e794582346f81706e Bug-Url: https://bugzilla.redhat.com/1077300 Signed-off-by: Roy Golan <rgo...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ActivateVdsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 6 files changed, 6 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/27203/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java index 6674a75..d15cb43 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.common.utils.Pair; -import org.ovirt.engine.core.common.vdscommands.ActivateVdsVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.SetHaMaintenanceModeVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.SetVdsStatusVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; @@ -53,14 +52,10 @@ final VDS vds = getVds(); try (EngineLock monitoringLock = acquireMonitorLock()) { ExecutionHandler.updateSpecificActionJobCompleted(vds.getId(), VdcActionType.MaintenanceVds, false); - runVdsCommand(VDSCommandType.SetVdsStatus, + VDSReturnValue changeStatusToUnassigned = runVdsCommand(VDSCommandType.SetVdsStatus, new SetVdsStatusVDSCommandParameters(getVdsId(), VDSStatus.Unassigned)); - VDSReturnValue returnValue = - runVdsCommand(VDSCommandType.ActivateVds, new ActivateVdsVDSCommandParameters(getVdsId())); - setSucceeded(returnValue.getSucceeded()); - - if (getSucceeded()) { + if (changeStatusToUnassigned.getSucceeded()) { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java index 67eb704..650d3a4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java @@ -83,7 +83,7 @@ // update group with the cpu name grp.setcpu_name(sc.getCpuName()); - grp.setArchitecture(ArchitectureType.undefined); + grp.setArchitecture(sc.getArchitecture()); // use suppress in order to update group even if action fails // (out of the transaction) diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 4890150..185b953 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -3,7 +3,6 @@ public enum VDSCommandType { AddVds("org.ovirt.engine.core.vdsbroker"), RemoveVds("org.ovirt.engine.core.vdsbroker"), - ActivateVds("org.ovirt.engine.core.vdsbroker"), FenceVds("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetStats("org.ovirt.engine.core.vdsbroker.vdsbroker"), CreateVm("org.ovirt.engine.core.vdsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ActivateVdsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ActivateVdsVDSCommand.java deleted file mode 100644 index f242abc..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ActivateVdsVDSCommand.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.core.vdsbroker; - -import org.ovirt.engine.core.common.vdscommands.ActivateVdsVDSCommandParameters; - -public class ActivateVdsVDSCommand<P extends ActivateVdsVDSCommandParameters> extends VdsIdVDSCommandBase<P> { - public ActivateVdsVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void executeVdsIdCommand() { - if (_vdsManager != null) { - setReturnValue(_vdsManager.activate()); - } else { - getVDSReturnValue().setSucceeded(false); - } - } -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index 993ab6e..eeafaf4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -377,19 +377,6 @@ DbFacade.getInstance().getVdsStatisticsDao().update(statisticsData); } - public VDS activate() { - VDS vds = null; - try { - vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); - refreshHost(vds); - } catch (Exception e) { - log.infoFormat("Failed to activate VDS = {0} with error: {1}.", - getVdsId(), e.getMessage()); - } - - return vds; - } - public void refreshHost(VDS vds) { try { refreshCapabilities(new AtomicBoolean(), vds); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index cf5d4c3..3a9adaf 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -354,9 +354,6 @@ _vdsManager.setIsSetNonOperationalExecuted(!ResourceManager.getInstance() .getEventListener() .vdsUpEvent(_vds)); - - // Check hardware capabilities in case VDS moved to up - processHardwareCapsNeeded = true; } // save all data to db saveDataToDb(); @@ -487,6 +484,9 @@ refreshVdsStats(); } } else { + if (_firstStatus != VDSStatus.Up ) { + monitoringStrategy.processHardwareCapabilities(_vds); + } // refresh dynamic data final AtomicBoolean processHardwareNeededAtomic = new AtomicBoolean(); VDSStatus refreshReturnStatus = -- To view, visit http://gerrit.ovirt.org/27203 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b0b7ff7d751c3c617f6ac1e794582346f81706e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
