Arik Hadas has uploaded a new change for review. Change subject: core: use AutoStartVmsRunner job from VdsUpdateRunTimeInfo ......................................................................
core: use AutoStartVmsRunner job from VdsUpdateRunTimeInfo Currently VdsUpdateRunTimeInfo invokes RunVmCommand for each HA VM that went down and only when it fails because of lock acquisition problem, the VM is added to the AutoStartVmsRunner job. This patch changes that, such that the VdsUpdateRunTimeInfo pass the VM to the AutoStartVmsRunner right away and it will try to run the VM in its next iteration. Change-Id: Ia5ff535810f969255fb1d496a11378c2c10bcb91 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java 2 files changed, 2 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/19501/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 17f074a..0a4339a 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 @@ -114,15 +114,6 @@ } @Override - protected boolean acquireLockInternal() { - final boolean acquireLock = super.acquireLockInternal(); - if (!acquireLock && getVm() != null && getVm().isAutoStartup()) { - AutoStartVmsRunner.getInstance().addVmToRun(getParameters().getVmId()); - } - return acquireLock; - } - - @Override protected VDS getDestinationVds() { if (_destinationVds == null) { Guid vdsId = diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index 34bc364..cf83525 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.action.HostStoragePoolParametersBase; import org.ovirt.engine.core.common.action.MigrateVmToServerParameters; import org.ovirt.engine.core.common.action.ReconstructMasterParameters; -import org.ovirt.engine.core.common.action.RunVmParams; import org.ovirt.engine.core.common.action.SetNonOperationalVdsParameters; import org.ovirt.engine.core.common.action.SetStoragePoolStatusParameters; import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; @@ -279,24 +278,14 @@ @Override public void runFailedAutoStartVM(Guid vmId) { - // We will reuse this because we can generate more than one event: + // Alert that the virtual machine failed: final AuditLogableBase event = new AuditLogableBase(); event.setVmId(vmId); - - // Alert that the virtual machine failed: AuditLogDirector.log(event, AuditLogType.HA_VM_FAILED); log.infoFormat("Highly Available VM went down. Attempting to restart. VM Name: {0}, VM Id:{1}", event.getVmName(), vmId); - // Try to start it again: - final VdcReturnValueBase result = Backend.getInstance().runInternalAction(VdcActionType.RunVm, - new RunVmParams(vmId), - ExecutionHandler.createInternalJobContext()); - - // Alert if the restart fails: - if (!result.getSucceeded()) { - AuditLogDirector.log(event, AuditLogType.HA_VM_RESTART_FAILED); - } + AutoStartVmsRunner.getInstance().addVmToRun(vmId); } @Override -- To view, visit http://gerrit.ovirt.org/19501 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5ff535810f969255fb1d496a11378c2c10bcb91 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
