Tomas Jelinek has uploaded a new change for review. Change subject: engine: VM NewPool-1 was restarted on Host <UNKNOWN> ......................................................................
engine: VM NewPool-1 was restarted on Host <UNKNOWN> If the host has been started as prestarted the following event log has been logged: VM NewPool-1 was restarted on Host <UNKNOWN> The problem was that the Vm has been started as stateless. This first triggers the statelessVmTreatment() which does not schedule the host but will already be logged (e.g. the host will be unknown). Fixed by checking if the host has already been scheduled and if not than a different message will be logged (a similar to the one when the VM is started as stateless by the user). Change-Id: I60a74762984dc82154d0f8e073c60f631da229f0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=966619 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 3 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/18726/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 293be6d..bf02695 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -534,10 +534,20 @@ if (mResume) { return getSucceeded() ? AuditLogType.USER_RESUME_VM : AuditLogType.USER_FAILED_RESUME_VM; } else if (isInternalExecution()) { - return getSucceeded() ? - (isStatelessSnapshotExistsForVm() ? AuditLogType.VDS_INITIATED_RUN_VM_AS_STATELESS - : AuditLogType.VDS_INITIATED_RUN_VM) : - AuditLogType.VDS_INITIATED_RUN_VM_FAILED; + if (getSucceeded()) { + boolean isStateless = isStatelessSnapshotExistsForVm(); + boolean isVdsKnown = getVds() != null; + if (isStateless && isVdsKnown) { + return AuditLogType.VDS_INITIATED_RUN_VM_AS_STATELESS; + } else if (isStateless) { + return AuditLogType.VDS_INITIATED_RUN_AS_STATELESS_VM_NOT_YET_RUNNING; + } else { + return AuditLogType.VDS_INITIATED_RUN_VM; + } + + } + + return AuditLogType.VDS_INITIATED_RUN_VM_FAILED; } else { return getSucceeded() ? (VMStatus) getActionReturnValue() == VMStatus.Up ? diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index e22f1bc..5e5c187 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -39,6 +39,7 @@ VDS_INITIATED_RUN_VM(506), VDS_INITIATED_RUN_VM_AS_STATELESS(537), VDS_INITIATED_RUN_VM_FAILED(507), + VDS_INITIATED_RUN_AS_STATELESS_VM_NOT_YET_RUNNING(525), // VDS_INITIATED_RUN_VM_CHECKOUT_FAILED = 508, VDS_INSTALL_IN_PROGRESS(509), VDS_INSTALL_IN_PROGRESS_WARNING(510), 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 24b4736..36a0260 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -325,6 +325,7 @@ VDS_INSTALL=Host ${VdsName} installed VDS_INSTALL_FAILED=Host ${VdsName} installation failed. ${FailedInstallMessage}. VDS_INITIALIZING=Host ${VdsName} is initializing. Message: ${ErrorMessage} +VDS_INITIATED_RUN_AS_STATELESS_VM_NOT_YET_RUNNING=Starting VM ${VmName} was initiated. VDS_INITIATED_RUN_VM=VM ${VmName} was restarted on Host ${VdsName} VDS_INITIATED_RUN_VM_AS_STATELESS=VM ${VmName} was restarted on Host ${VdsName} as stateless VDS_INITIATED_RUN_VM_FAILED=Failed to restart VM ${VmName} on Host ${VdsName} -- To view, visit http://gerrit.ovirt.org/18726 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60a74762984dc82154d0f8e073c60f631da229f0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
