path: root/tests
diff options
authorRavishankar N <>2013-06-13 14:51:46 +0000
committerVijay Bellur <>2013-08-13 07:10:17 -0700
commit528cbf0ef1b8cbabbab5141df69353d7cf9f59f5 (patch)
treed8f0cebeb7f5185494f7f2182ba51da63327719b /tests
parente75071a5eee1a69caac4d0477f5458ddfe776f07 (diff)
glusterd: remove-brick:Allow simultaneous removal of multiple subvolumes.
Currently, remove-brick supports removal of only one distributed stripe/ replica pair at a time. Fix it to support removal of multiple pairs. This is consistent with add-brick behaviour which supports adding multiple stripe/replica pairs simultaneously. Removal is successful irrespective of the order of the bricks given at the CLI, as long as the bricks are from the same subvolume(s). Change-Id: I7c11c1235ce07b124155978b9d48d0ea65396103 BUG: 974007 Signed-off-by: Ravishankar N <> Reviewed-on: Tested-by: Gluster Build System <> Reviewed-by: Krishnan Parthasarathi <>
Diffstat (limited to 'tests')
2 files changed, 55 insertions, 1 deletions
diff --git a/tests/bugs/bug-974007.t b/tests/bugs/bug-974007.t
new file mode 100644
index 00000000..c8c1c862
--- /dev/null
+++ b/tests/bugs/bug-974007.t
@@ -0,0 +1,52 @@
+#Test case: Create a distributed replicate volume, and remove multiple
+#replica pairs in a single remove-brick command.
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+#Basic checks
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume info
+#Create a 3X2 distributed-replicate volume
+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1..6};
+TEST $CLI volume start $V0
+# Mount FUSE and create files
+TEST glusterfs -s $H0 --volfile-id $V0 $M0
+TEST touch $M0/file{1..10}
+# Remove bricks from two sub-volumes to make it a 1x2 vol.
+# Bricks in question are given in a random order but from the same subvols.
+function remove_brick_start_status {
+ $CLI volume remove-brick $V0 \
+ $H0:$B0/${V0}6 $H0:$B0/${V0}1 \
+ $H0:$B0/${V0}2 $H0:$B0/${V0}5 start 2>&1 |grep -oE "success|failed"
+EXPECT "success" remove_brick_start_status;
+# Wait for rebalance to complete
+EXPECT_WITHIN 10 "completed" remove_brick_status_completed_field "$V0" "$H0:$B0/${V0}6 $H0:$B0/${V0}1 $H0:$B0/${V0}2 $H0:$B0/${V0}5"
+# Check commit status
+function remove_brick_commit_status {
+ $CLI volume remove-brick $V0 \
+ $H0:$B0/${V0}6 $H0:$B0/${V0}1 \
+ $H0:$B0/${V0}2 $H0:$B0/${V0}5 commit 2>&1 |grep -oE "success|failed"
+EXPECT "success" remove_brick_commit_status;
+# Check the volume type
+EXPECT "Replicate" echo `$CLI volume info |grep Type |awk '{print $2}'`
+TEST umount $M0
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0;
+TEST ! $CLI volume info $V0;
diff --git a/tests/volume.rc b/tests/volume.rc
index 02892d71..470fe9a7 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -31,7 +31,9 @@ function rebalance_status_field {
function remove_brick_status_completed_field {
- $CLI volume remove-brick $V0 $H0:$B0/r2d2_{4,5} status | awk '{print $7}' | sed -n 3p
+ local vol=$1
+ local brick_list=$2
+ $CLI volume remove-brick $vol $brick_list status | awk '{print $7}' | sed -n 3p
function get_mount_process_pid {