Roy Golan has uploaded a new change for review. Change subject: core: add mapping for internalVdsmTimoutError ......................................................................
core: add mapping for internalVdsmTimoutError Signed-off-by: Roy Golan <[email protected]> Change-Id: Ie1c9505a9238bfa16398ef745dcbb91c0c392938 --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VDSError.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java 4 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/10357/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VDSError.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VDSError.java index e78cf2c..4ad5031 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VDSError.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VDSError.java @@ -5,6 +5,7 @@ private String message; private VdcBllErrors code = VdcBllErrors.forValue(0); private java.util.ArrayList<Object> args; + private String exception; public VDSError(VdcBllErrors code, String message) { this.code = code; @@ -38,4 +39,16 @@ public VDSError() { } + + /** + * optional exception as thrown by underlying layer. Error returned due to an exception are not guaranteed to fill + * the underline exception cause. + */ + public String getException() { + return exception; + } + + public void setException(String exception) { + this.exception = exception; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java index b132d62..1c5b744 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java @@ -48,6 +48,7 @@ UPDATE_VNIC_FAILED(56), recovery(99), GeneralException(100), + INTERNAL_VDSM_TIMEOUT(101), StorageException(200), VolumeDoesNotExist(201), IncorrectFormat(202), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java index 74e9497..ec0a15e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java @@ -188,6 +188,7 @@ VDSError tempVar = new VDSError(); tempVar.setCode(returnStatus); tempVar.setMessage(getReturnStatus().mMessage); + tempVar.setException(getReturnStatus().getException()); outEx.setVdsError(tempVar); throw outEx; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java index 4b4f431..670d317 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java @@ -6,13 +6,16 @@ private static final String CODE = "code"; private static final String MESSAGE = "message"; + private static final String EXCEPTION = "exception"; public int mCode; public String mMessage; + private String exception; public StatusForXmlRpc(Map<String, Object> innerMap) { mCode = (Integer) innerMap.get(CODE); mMessage = (String) innerMap.get(MESSAGE); + exception = (String) innerMap.get(EXCEPTION); } // used for backwards compatibility with c#. @@ -23,4 +26,9 @@ public String toString() { return "StatusForXmlRpc [mCode=" + mCode + ", mMessage=" + mMessage + "]"; } + + public String getException() { + return exception; + } + } -- To view, visit http://gerrit.ovirt.org/10357 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1c9505a9238bfa16398ef745dcbb91c0c392938 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
