Arik Hadas has uploaded a new change for review.
Change subject: core: bug 1163142
......................................................................
core: bug 1163142
Change-Id: Iee3bdb65ca58c49de65770d4e9cf9435bbbe5070
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java
2 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/35890/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 9e5e381..3144e11 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
@@ -232,15 +232,14 @@
ExecutionHandler.setAsyncJob(getExecutionContext(), true);
}
} catch(VdcBLLException e) {
- VdcBllErrors errorCode = e.getErrorCode();
-
// if the returned exception is such that shoudn't trigger the
re-run process,
// re-throw it. otherwise, continue (the vm will be down and a
re-run will be triggered)
- switch (errorCode) {
+ switch (e.getErrorCode()) {
case Done: // should never get here with errorCode = 'Done'
though
case exist:
case VDS_NETWORK_ERROR: // probably wrong xml format sent.
case PROVIDER_FAILURE:
+ runningFailed();
throw e;
default:
log.warn("Failed to run VM '{}': {}", getVmName(),
e.getMessage());
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java
index c3cfcb9..529d693 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVDSCommand.java
@@ -4,6 +4,9 @@
import java.util.Map;
import org.ovirt.engine.core.common.businessentities.VM;
+import org.ovirt.engine.core.common.businessentities.VMStatus;
+import org.ovirt.engine.core.common.errors.VDSError;
+import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils;
import org.ovirt.engine.core.common.vdscommands.CreateVmVDSCommandParameters;
import org.slf4j.Logger;
@@ -26,6 +29,11 @@
@Override
protected void executeVdsBrokerCommand() {
+ getVDSReturnValue().setReturnValue(VMStatus.Down);
+ getVDSReturnValue().setSucceeded(false);
+ getVDSReturnValue().setExceptionString("arik");
+ getVDSReturnValue().setVdsError(new
VDSError(VdcBllErrors.VDS_NETWORK_ERROR, "arik2"));
+ getVDSReturnValue().setExceptionObject(new VDSNetworkException(""));
buildVmData();
logCommandInfo();
mVmReturn = getBroker().create(createInfo);
--
To view, visit http://gerrit.ovirt.org/35890
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee3bdb65ca58c49de65770d4e9cf9435bbbe5070
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
