Libor Spevak has uploaded a new change for review. Change subject: core: Append VM if host goes into error state ......................................................................
core: Append VM if host goes into error state Add a VM name to audit log message, if the VM cannot be started and the host goes into an error state. Change-Id: I4dd8d83359b67f9c5438eee88f1e6ef3db18a009 Bug-Url: https://bugzilla.redhat.com/947867 Signed-off-by: Libor Spevak <lspe...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FailedToRunVmVDSCommandParameters.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/FailedToRunVmVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 5 files changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/14076/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java index d4137c5..adfef0c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java @@ -255,7 +255,7 @@ for (Guid vdsId : getRunVdssList()) { if (!getCurrentVdsId().equals(vdsId)) { Backend.getInstance().getResourceManager() - .RunVdsCommand(VDSCommandType.FailedToRunVm, new FailedToRunVmVDSCommandParameters(vdsId)); + .RunVdsCommand(VDSCommandType.FailedToRunVm, new FailedToRunVmVDSCommandParameters(vdsId, getVmId())); } } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FailedToRunVmVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FailedToRunVmVDSCommandParameters.java index bc26ac6..b49ead4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FailedToRunVmVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FailedToRunVmVDSCommandParameters.java @@ -3,10 +3,22 @@ import org.ovirt.engine.core.compat.Guid; public class FailedToRunVmVDSCommandParameters extends VdsIdVDSCommandParametersBase { - public FailedToRunVmVDSCommandParameters(Guid vdsId) { + Guid vmId; + + public FailedToRunVmVDSCommandParameters(Guid vdsId, Guid vmId) { super(vdsId); + this.vmId = vmId; } public FailedToRunVmVDSCommandParameters() { } + + public Guid getVmId() { + return vmId; + } + + public void setVmId(Guid vmId) { + this.vmId = vmId; + } + } diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index dac1553..50f259a 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -224,7 +224,7 @@ USER_INITIATED_RUN_VM=Starting VM ${VmName} was initiated by ${UserName}. USER_STARTED_VM=VM ${VmName} was started by ${UserName} (Host: ${VdsName}). USER_INITIATED_RUN_VM_FAILED=Failed to run VM ${VmName} on Host ${VdsName}. -VDS_FAILED_TO_RUN_VMS=Host ${VdsName} will be switched to Error status for ${Time} minutes because it failed to run a VM. +VDS_FAILED_TO_RUN_VMS=Host ${VdsName} will be switched to Error status for ${Time} minutes because it failed to run a VM ${VmName}. USER_ADD_TAG=New Tag ${TagName} was created by ${UserName}. USER_ADD_TAG_FAILED=Failed to create Tag named ${TagName} (User: ${UserName}). USER_REMOVE_TAG=Tag ${TagName} was removed by ${UserName}. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/FailedToRunVmVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/FailedToRunVmVDSCommand.java index ee09b3b..059d785 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/FailedToRunVmVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/FailedToRunVmVDSCommand.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.vdsbroker; -import org.ovirt.engine.core.common.vdscommands.*; +import org.ovirt.engine.core.common.vdscommands.FailedToRunVmVDSCommandParameters; public class FailedToRunVmVDSCommand<P extends FailedToRunVmVDSCommandParameters> extends VdsIdVDSCommandBase<P> { public FailedToRunVmVDSCommand(P parameters) { @@ -10,7 +10,7 @@ @Override protected void ExecuteVdsIdCommand() { if (_vdsManager != null) { - _vdsManager.failedToRunVm(getVds()); + _vdsManager.failedToRunVm(getVds(), getParameters().getVmId()); } 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 e3708cc..bdd750a 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 @@ -499,7 +499,7 @@ } } - public void failedToRunVm(VDS vds) { + public void failedToRunVm(VDS vds, Guid vmId) { if (mFailedToRunVmAttempts.get() < Config.<Integer> GetValue(ConfigValues.NumberOfFailedRunsOnVds) && mFailedToRunVmAttempts.incrementAndGet() >= Config .<Integer> GetValue(ConfigValues.NumberOfFailedRunsOnVds)) { @@ -508,8 +508,10 @@ SchedulerUtilQuartzImpl.getInstance().resumeJob(duringFailureJobId); AuditLogableBase logable = new AuditLogableBase(vds.getId()); + logable.setVmId(vmId); logable.addCustomValue("Time", Config.<Integer> GetValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes) .toString()); + AuditLogDirector.log(logable, AuditLogType.VDS_FAILED_TO_RUN_VMS); log.infoFormat("Vds {0} moved to Error mode after {1} attempts. Time: {2}", vds.getName(), mFailedToRunVmAttempts, new java.util.Date()); -- To view, visit http://gerrit.ovirt.org/14076 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4dd8d83359b67f9c5438eee88f1e6ef3db18a009 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Libor Spevak <lspe...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
