Sahina Bose has uploaded a new change for review. Change subject: engine: Handling generic gluster errors from vdsm ......................................................................
engine: Handling generic gluster errors from vdsm Added missing definitions of generic gluster error codes returned from vdsm. Change-Id: I8bb92c52d44171de8e880be8f003d4ac52e0e08f Bug-Url: https://bugzilla.redhat.com/914667 Signed-off-by: Sahina Bose <sah...@gmail.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java 4 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/12709/1 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 6b80bcb..70f75a6 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 @@ -334,6 +334,12 @@ VolumeGeneralException(4000), // Gluster VDSM errors + GlusterGeneralException(4101), + GlusterPermissionDeniedException(4102), + GlusterSyntaxErrorException(4103), + GlusterMissingArgumentException(4104), + GlusterCmdExecFailedException(4105), + GlusterXmlErrorException(4106), GlusterVolumeCreateFailed(4122), GlusterVolumeStartFailed(4125), GlusterVolumeStopFailed(4127), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index bc9e432..83955bc 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -313,7 +313,13 @@ MetaDataGeneralError=General Meta data error ResourceDoesNotExist=Resource does not exist InvalidResourceName=Invalid resource name -# Gluster VDSM errors +# Gluster VDSM errors +GlusterGeneralException=Gluster General Exception +GlusterPermissionDeniedException=Permission denied +GlusterSyntaxErrorException=Syntax error +GlusterMissingArgumentException=Missing argument +GlusterCmdExecFailedException=Command execution failed +GlusterXmlErrorException=XML error GlusterVolumeCreateFailed=Gluster Volume Create Failed GlusterVolumeStartFailed=Gluster Volume Start Failed GlusterVolumeStopFailed=Gluster Volume Stop Failed diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java index b2ec324..33d3707 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java @@ -18,6 +18,12 @@ protected void ProceedProxyReturnValue() { VdcBllErrors returnStatus = GetReturnValueFromStatus(getReturnStatus()); switch (returnStatus) { + case GlusterGeneralException: + case GlusterPermissionDeniedException: + case GlusterSyntaxErrorException: + case GlusterMissingArgumentException: + case GlusterCmdExecFailedException: + case GlusterXmlErrorException: case GlusterVolumeCreateFailed: case GlusterVolumeStartFailed: case GlusterVolumeStopFailed: diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java index 0493ee8..fd78517 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java @@ -673,6 +673,24 @@ String VM_WITH_SAME_NAME_EXIST(); + @DefaultStringValue("Gluster General Exception occurred.") + String GlusterGeneralException(); + + @DefaultStringValue("Permission denied") + String GlusterPermissionDeniedException(); + + @DefaultStringValue("Command failed due to a Syntax error") + String GlusterSyntaxErrorException(); + + @DefaultStringValue("Command failed due to a missing argument") + String GlusterMissingArgumentException(); + + @DefaultStringValue("Command execution failed") + String GlusterCmdExecFailedException(); + + @DefaultStringValue("XML error") + String GlusterXmlErrorException(); + @DefaultStringValue("Gluster Volume Delete Failed.") String GlusterVolumeDeleteFailed(); -- To view, visit http://gerrit.ovirt.org/12709 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bb92c52d44171de8e880be8f003d4ac52e0e08f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sab...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
