Sahina Bose has uploaded a new change for review. Change subject: engine:VDSM errors code for hooks updated ......................................................................
engine:VDSM errors code for hooks updated Synced the VDSM error codes handled in engine as per patch http://gerrit.ovirt.org/#/c/9671/ Removed reference to HookAlreadyEnabled and HookAlreadyDisabled errors as vdsm does not return these error codes anymore. Change-Id: I2eb4e93c42758284e03a77a718d42edbe923327e Signed-off-by: Sahina Bose <sab...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java 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 6 files changed, 10 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/14163/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java index 5e6b82d..3f90864 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook; import org.ovirt.engine.core.common.constants.gluster.GlusterConstants; -import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -113,9 +112,7 @@ for (Pair<VDS, VDSReturnValue> pairResult : pairResults) { VDSReturnValue retValue = pairResult.getSecond(); - // ignore already enabled/disabled errors. - if (retValue.getSucceeded() || VdcBllErrors.GlusterHookAlreadyEnabled.equals(retValue.getVdsError().getCode()) - || VdcBllErrors.GlusterHookAlreadyDisabled.equals(retValue.getVdsError().getCode())) { + if (retValue.getSucceeded() ) { atLeastOneSuccess = true; // update status in database addOrUpdateServerHook(serverHooks, pairResult); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java index 46580c6..a79e353 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java @@ -11,7 +11,6 @@ import org.mockito.runners.MockitoJUnitRunner; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.gluster.GlusterHookParameters; -import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.dal.VdcBllMessages; @RunWith(MockitoJUnitRunner.class) @@ -73,16 +72,6 @@ cmd.executeCommand(); assertFalse(cmd.getReturnValue().getSucceeded()); assertEquals(cmd.getAuditLogTypeValue(), AuditLogType.GLUSTER_HOOK_DISABLE_FAILED); - } - - @Test - public void executeCommandWhenAlreadyDisabled() { - cmd = spy(new DisableGlusterHookCommand(new GlusterHookParameters(CLUSTER_ID, HOOK_ID))); - setupMocks(cmd); - mockBackend(cmd,false,VdcBllErrors.GlusterHookAlreadyDisabled); - cmd.executeCommand(); - assertTrue(cmd.getReturnValue().getSucceeded()); - assertEquals(cmd.getAuditLogTypeValue(), AuditLogType.GLUSTER_HOOK_DISABLE); } } 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 04fad6a..78a713c 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 @@ -368,12 +368,11 @@ RemoveGlusterServerFailed(4406), GlusterPeerListFailed(4407), GlusterHookFailed(4500), - GlusterHookEnableFailed(4501), - GlusterHookDisableFailed(4502), - GlusterHookAlreadyEnabled(4503), - GlusterHookAlreadyDisabled(4504), - GlusterHookNotFound(4505), - GlusterHookListException(4511), + GlusterHookListException(4501), + GlusterHookEnableFailed(4502), + GlusterHookDisableFailed(4503), + GlusterHookNotFound(4504), + GlusterHookConflict(4505), UnicodeArgumentException(4900), 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 cb0040c..a39e619 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -348,10 +348,9 @@ GlusterHookFailed=Gluster hook operation failed GlusterHookEnableFailed=Failed to enable gluster hook GlusterHookDisableFailed=Failed to disable gluster hook -GlusterHookAlreadyEnabled=Gluster hook already enabled -GlusterHookAlreadyDisabled=Gluster hook already disabled GlusterHookNotFound=Gluster hook not found GlusterHookListException=Failed to get gluster hook list +GlusterHookConflict=Found conflicting hooks CANT_RECONSTRUCT_WHEN_A_DOMAIN_IN_POOL_IS_LOCKED=Can't reconstruct the Master Domain when the Data Center contains Domains in Locked state.\nPlease wait until the operation for these Domains ends before trying to reconstruct the Master Domain again. NO_IMPLEMENTATION=Not implemented 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 33e1308..8e76bc2 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 @@ -46,10 +46,9 @@ case GlusterHookFailed: case GlusterHookEnableFailed: case GlusterHookDisableFailed: - case GlusterHookAlreadyEnabled: - case GlusterHookAlreadyDisabled: case GlusterHookNotFound: case GlusterHookListException: + case GlusterHookConflict: // Capture error from gluster command and record failure getVDSReturnValue().setVdsError(new VDSError(returnStatus, getReturnStatus().mMessage)); getVDSReturnValue().setSucceeded(false); 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 f37a2b7..de05687 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 @@ -729,14 +729,11 @@ @DefaultStringValue("Failed to enable gluster hook.") String GlusterHookEnableFailed(); - @DefaultStringValue("Gluster Hook already enabled.") - String GlusterHookAlreadyEnabled(); - @DefaultStringValue("Failed to disable gluster hook.") String GlusterHookDisableFailed(); - @DefaultStringValue("Gluster Hook already disabled.") - String GlusterHookAlreadyDisabled(); + @DefaultStringValue("Found conflicting hooks.") + String GlusterHookConflict(); @DefaultStringValue("Gluster hook not found") String GlusterHookNotFound(); -- To view, visit http://gerrit.ovirt.org/14163 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2eb4e93c42758284e03a77a718d42edbe923327e 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
