Darshan N has uploaded a new change for review. Change subject: gluster: correct error message on failure to start remove brick ......................................................................
gluster: correct error message on failure to start remove brick The variable type in error message for faliure to start remove brick is changed from Gluster Volume to Gluster Brick(s). bug url: https://bugzilla.redhat.com/show_bug.cgi?id=1020282 Signed-off-by: ndarshan <dnara...@redhat.com> Change-Id: I10a55829a11fc19e1a43f38f45911e7aaf91d5b8 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommand.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties 6 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/21200/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java index 75d25a6..975785e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java @@ -48,7 +48,6 @@ @Override protected void setActionMessageParameters() { - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__GLUSTER_VOLUME); addCanDoActionMessage(String.format("$volumeName %1$s", getGlusterVolumeName())); addCanDoActionMessage(String.format("$vdsGroup %1$s", getVdsGroupName())); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommand.java index 4373e87..7fbcd29 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommand.java @@ -29,6 +29,7 @@ @Override protected void setActionMessageParameters() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REBALANCE_START); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__GLUSTER_VOLUME); super.setActionMessageParameters(); } diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 6e95f6e..388d3f5 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -905,7 +905,7 @@ # Gluster Error Messages VAR__TYPE__GLUSTER_VOLUME=$type Gluster Volume VAR__TYPE__GLUSTER_VOLUME_OPTION=$type Gluster Volume Option -VAR__TYPE__GLUSTER_BRICK=$type Gluster Brick +VAR__TYPE__GLUSTER_BRICK=$type Gluster Brick(s) VAR__TYPE__GLUSTER_SERVER=$type Gluster Server VAR__TYPE__GLUSTER_HOOK=$type Gluster Hook VAR__TYPE__GLUSTER_SERVICE=$type Service diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 3f8b259..9d5efe2 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -826,6 +826,9 @@ @DefaultStringValue("$action rebalance") String VAR__ACTION__REBALANCE_START(); + @DefaultStringValue("$action start removing") + String VAR__ACTION__REMOVE_BRICKS_START(); + @DefaultStringValue("$action stop rebalance") String VAR__ACTION__REBALANCE_STOP(); @@ -922,7 +925,7 @@ @DefaultStringValue("$type Gluster Volume Rebalance") String VAR__TYPE__GLUSTER_VOLUME_REBALANCE(); - @DefaultStringValue("$type Gluster Brick") + @DefaultStringValue("$type Gluster Brick(s)") String VAR__TYPE__GLUSTER_BRICK(); @DefaultStringValue("$type Gluster Server") diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 4edac87..4cd23e0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -265,7 +265,7 @@ VAR__TYPE__GLUSTER_VOLUME=$type Gluster Volume VAR__TYPE__GLUSTER_VOLUME_OPTION=$type Gluster Volume Option VAR__TYPE__GLUSTER_VOLUME_REBALANCE=$type Gluster Volume Rebalance -VAR__TYPE__GLUSTER_BRICK=$type Gluster Brick +VAR__TYPE__GLUSTER_BRICK=$type Gluster Brick(s) VAR__TYPE__GLUSTER_SERVER=$type Gluster Server VAR__TYPE__GLUSTER_HOOK=$type Gluster Hook VAR__TYPE__GLUSTER_SERVICE=$type Service diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties index af2a4dd..a5e134d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties @@ -370,7 +370,7 @@ VAR__TYPE__GLUSTER_VOLUME=$type \u7FA4\u96C6\u5377 VAR__TYPE__GLUSTER_VOLUME_OPTION=$type \u8BBE\u7F6E\u7FA4\u96C6\u5377\u9009\u9879 VAR__TYPE__GLUSTER_VOLUME_REBALANCE=$type \u7FA4\u96C6\u5377 Rebalance -VAR__TYPE__GLUSTER_BRICK=$type Gluster Brick +VAR__TYPE__GLUSTER_BRICK=$type Gluster Brick(s) VAR__TYPE__GLUSTER_SERVER=$type \u7FA4\u96C6\u670D\u52A1\u5668 VAR__TYPE__GLUSTER_HOOK=$type \u7FA4\u96C6 Hook VAR__TYPE__GLUSTER_SERVICE=$type Service -- To view, visit http://gerrit.ovirt.org/21200 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10a55829a11fc19e1a43f38f45911e7aaf91d5b8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Darshan N <dnara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
