anmolbabu has uploaded a new change for review. Change subject: webadmin : Fix for sub-volumes removal from distributed-replicate volume ......................................................................
webadmin : Fix for sub-volumes removal from distributed-replicate volume The newer Glusterfs allows 1. removal of one/more sub-volumes from a distributed-replicate volume. But,The earlier versions were not. 2. removal of one volume from each sub-volume is now no more allowed. But,earlier it was allowed. This fix solves allows rhsc to adapt to these changes in Glusterfs CLI. Change-Id: Iea1b7a81c81011d62a9d3bab7592e03cba18ec08 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1031585 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java 1 file changed, 9 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/21502/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java index 55b3a1c..ec85a04 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java @@ -696,7 +696,7 @@ int replicaCount = removeBrickModel.getReplicaCount(); int distributions = brickList.size() / replicaCount; - if (selectedBricks.size() != replicaCount && selectedBricks.size() != distributions) + if (selectedBricks.size() == brickList.size()) { return false; } @@ -705,31 +705,19 @@ { List<GlusterBrickEntity> subBrickList = brickList.subList((i * replicaCount), (i * replicaCount) + replicaCount); - if (subBrickList.containsAll(selectedBricks)) - { - return true; + if(selectedBricks.containsAll(subBrickList)){ + continue; } - int count = 0; - for (GlusterBrickEntity brick : selectedBricks) - { - if (subBrickList.contains(brick)) - { - count++; + else { + for(GlusterBrickEntity brick : subBrickList) { + if(selectedBricks.contains(brick)) { + return false; + } } - } - if (count == 1 && i == (distributions - 1)) - { - removeBrickModel.setReplicaCount(removeBrickModel.getReplicaCount() - 1); - removeBrickModel.setReduceReplica(true); - return true; - } - else if (count > 1) - { - return false; } } - return false; + return true; } public boolean validateDistriputedStripeRemove(GlusterVolumeType volumeType, -- To view, visit http://gerrit.ovirt.org/21502 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea1b7a81c81011d62a9d3bab7592e03cba18ec08 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
