Liron Aravot has uploaded a new change for review. Change subject: core: ISO domain permission error shouldn't tirgger SPM selection. ......................................................................
core: ISO domain permission error shouldn't tirgger SPM selection. Failure in executing getFloppyList/HsmGetIsoList commands with permission error triggers DC reinitialization instead of just logging the error. Change-Id: I4e75982d1a88dc36251d2c2e693ffafdc7a7a99e Bug-Url: https://bugzilla.redhat.com/854975 Signed-off-by: Liron Aravot <lara...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.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/HsmGetIsoListVDSCommand.java 3 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/8690/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java index 5e37477..7d8c799 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java @@ -26,6 +26,12 @@ } @Override + protected VDSExceptionBase createDefaultConcreteException(String errorMessage) { + VDSExceptionBase outEx = new IrsOperationFailedNoFailoverException(errorMessage); + return outEx; + } + + @Override protected Object getReturnValueFromBroker() { return _isoList; } 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 8c85ba1..615759f 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 @@ -197,6 +197,12 @@ VDSExceptionBase outEx; final String errorMessage = String.format("Failed to %1$s, error = %2$s", getCommandName(), getReturnStatus().mMessage); + outEx = createDefaultConcreteException(errorMessage); + return outEx; + } + + protected VDSExceptionBase createDefaultConcreteException(String errorMessage) { + VDSExceptionBase outEx; if (this instanceof IrsBrokerCommand) { outEx = new IRSErrorException(errorMessage); } else { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java index 4d07df0..e327d25 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java @@ -22,6 +22,12 @@ } @Override + protected VDSExceptionBase createDefaultConcreteException(String errorMessage) { + VDSExceptionBase outEx = new IrsOperationFailedNoFailoverException(errorMessage); + return outEx; + } + + @Override protected Object getReturnValueFromBroker() { return _isoList; } -- To view, visit http://gerrit.ovirt.org/8690 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e75982d1a88dc36251d2c2e693ffafdc7a7a99e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <lara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
