Liran Zelkha has uploaded a new change for review. Change subject: core: Remove error messages from log when adding host ......................................................................
core: Remove error messages from log when adding host When we add a host 3 errors on not finding vdsManager for the host appeared in the log. This patch fixes this issue. Change-Id: Ia17656dbfa0e16457565b04b849eb80ea74a8949 Bug-Url: https://bugzilla.redhat.com/1062438 Signed-off-by: [email protected] <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVdsVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/AddVdsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/RemoveVdsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java 7 files changed, 51 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/24980/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index b77a890..f237432 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -125,7 +125,7 @@ TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { - initializeVds(); + initializeVds(false); AlertIfPowerManagementNotConfigured(getParameters().getVdsStaticData()); TestVdsPowerManagementStatus(getParameters().getVdsStaticData()); setSucceeded(true); @@ -376,8 +376,8 @@ } catch (Exception e) { log.warnFormat( - "Failed to initiate vdsm-id request on host", - e + "Failed to initiate vdsm-id request on host with message {0}", + e.getMessage() ); return null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java index b45b624..9a2ea80 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java @@ -49,10 +49,14 @@ } protected void initializeVds() { + initializeVds(true); + } + + protected void initializeVds(boolean expectHostToBeFound) { Backend.getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.RemoveVds, - new RemoveVdsVDSCommandParameters(getVdsId())); + new RemoveVdsVDSCommandParameters(getVdsId(), expectHostToBeFound)); Backend.getInstance().getResourceManager() .RunVdsCommand(VDSCommandType.AddVds, new AddVdsVDSCommandParameters(getVdsId())); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVdsVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVdsVDSCommandParameters.java index 9b95698..947c3f1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVdsVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVdsVDSCommandParameters.java @@ -3,10 +3,26 @@ import org.ovirt.engine.core.compat.Guid; public class RemoveVdsVDSCommandParameters extends VdsIdVDSCommandParametersBase { + private boolean errorIfHostDoesntExist = true; + public RemoveVdsVDSCommandParameters(Guid vdsId) { super(vdsId); } public RemoveVdsVDSCommandParameters() { } + + public RemoveVdsVDSCommandParameters(Guid vdsId, boolean errorIfHostDoesntExist) { + super(vdsId); + this.errorIfHostDoesntExist = errorIfHostDoesntExist; + } + + public boolean isErrorIfHostDoesntExist() { + return errorIfHostDoesntExist; + } + + public void setErrorIfHostDoesntExist(boolean errorIfHostDoesntExist) { + this.errorIfHostDoesntExist = errorIfHostDoesntExist; + } + } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/AddVdsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/AddVdsVDSCommand.java index 30b5b25..38325a6 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/AddVdsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/AddVdsVDSCommand.java @@ -8,7 +8,7 @@ public class AddVdsVDSCommand<P extends AddVdsVDSCommandParameters> extends VdsIdVDSCommandBase<P> { public AddVdsVDSCommand(P parameters) { - super(parameters); + super(parameters, false); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/RemoveVdsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/RemoveVdsVDSCommand.java index 4ec4710..01ce291 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/RemoveVdsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/RemoveVdsVDSCommand.java @@ -3,12 +3,16 @@ import org.ovirt.engine.core.common.vdscommands.RemoveVdsVDSCommandParameters; public class RemoveVdsVDSCommand<P extends RemoveVdsVDSCommandParameters> extends VdsIdVDSCommandBase<P> { + + private P parameters; + public RemoveVdsVDSCommand(P parameters) { - super(parameters); + super(parameters, parameters.isErrorIfHostDoesntExist()); + this.parameters = parameters; } @Override protected void executeVdsIdCommand() { - ResourceManager.getInstance().RemoveVds(getVdsId()); + ResourceManager.getInstance().RemoveVds(getVdsId(), parameters.isErrorIfHostDoesntExist()); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java index d9da428..f1bb59e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java @@ -212,7 +212,11 @@ } public void RemoveVds(Guid vdsId) { - VdsManager vdsManager = GetVdsManager(vdsId); + RemoveVds(vdsId, true); + } + + public void RemoveVds(Guid vdsId, boolean errorIfManagerNotFound) { + VdsManager vdsManager = GetVdsManager(vdsId, errorIfManagerNotFound); if (vdsManager != null) { vdsManager.dispose(); vdsManagersDict.remove(vdsId); @@ -220,9 +224,17 @@ } public VdsManager GetVdsManager(Guid vdsId) { + return GetVdsManager(vdsId, true); + } + + public VdsManager GetVdsManager(Guid vdsId, boolean errorIfManagerNotFound) { VdsManager vdsManger = vdsManagersDict.get(vdsId); if (vdsManger == null) { - log.errorFormat("Cannot get vdsManager for vdsid={0}", vdsId); + if (errorIfManagerNotFound) { + log.errorFormat("Cannot get vdsManager for vdsid={0}", vdsId); + } else { + log.infoFormat("Cannot get vdsManager for vdsid={0}", vdsId); + } } return vdsManger; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java index 5df48d3..e2b8542 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java @@ -8,9 +8,13 @@ public abstract class VdsIdVDSCommandBase<P extends VdsIdVDSCommandParametersBase> extends VDSCommandBase<P> { protected VdsManager _vdsManager; - public VdsIdVDSCommandBase(P parameters) { + public VdsIdVDSCommandBase(P parameters, boolean expectVdsManager) { super(parameters); - _vdsManager = ResourceManager.getInstance().GetVdsManager(parameters.getVdsId()); + _vdsManager = ResourceManager.getInstance().GetVdsManager(parameters.getVdsId(), expectVdsManager); + } + + public VdsIdVDSCommandBase(P parameters) { + this(parameters, true); } protected Guid getVdsId() { -- To view, visit http://gerrit.ovirt.org/24980 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia17656dbfa0e16457565b04b849eb80ea74a8949 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
