From ee824ccb10e28489907fbf978a2d36b0b2c5dc8c Mon Sep 17 00:00:00 2001 From: anand Date: Sat, 13 Jun 2015 16:46:10 +0530 Subject: glusterd: rebalance support for cluster.rc framework Issue:Rebalance is failing in cluster framework (any simulated cluster environment in same node ). RCA: 1. we are passing always "localhost" as volfile server for rebalance xlator . 2. Rebalance daemons are overwriting unix socket and log files each other. (All rebalance processes are creating socket with same name) . Fix: set vol_file_server, unix socket and log files properly. Change-Id: I6654461e00c2a164b2f1f1db24a316c4180dd8d5 BUG: 1231437 Signed-off-by: anand Reviewed-on: http://review.gluster.org/11210 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Raghavendra G Reviewed-by: Atin Mukherjee --- .../bug-1231437-rebalance-test-in-cluster.t | 31 ++++++++++++++++++++++ tests/cluster.rc | 16 +++++++++++ 2 files changed, 47 insertions(+) create mode 100644 tests/bugs/glusterd/bug-1231437-rebalance-test-in-cluster.t (limited to 'tests') diff --git a/tests/bugs/glusterd/bug-1231437-rebalance-test-in-cluster.t b/tests/bugs/glusterd/bug-1231437-rebalance-test-in-cluster.t new file mode 100644 index 00000000000..3257f6994dd --- /dev/null +++ b/tests/bugs/glusterd/bug-1231437-rebalance-test-in-cluster.t @@ -0,0 +1,31 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../cluster.rc +. $(dirname $0)/../../volume.rc + + +cleanup; +TEST launch_cluster 2; +TEST $CLI_1 peer probe $H2; + +EXPECT_WITHIN $PROBE_TIMEOUT 1 peer_count + +$CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0 +EXPECT 'Created' cluster_volinfo_field 1 $V0 'Status'; + +$CLI_1 volume start $V0 +EXPECT 'Started' cluster_volinfo_field 1 $V0 'Status'; + +#Mount FUSE +TEST glusterfs -s $H1 --volfile-id=$V0 $M0; + +TEST mkdir $M0/dir{1..4}; +TEST touch $M0/dir{1..4}/files{1..4}; + +TEST $CLI_1 volume add-brick $V0 $H1:$B1/${V0}1 $H2:$B2/${V0}1 + +TEST $CLI_1 volume rebalance $V0 start +EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" cluster_rebalance_status_field 1 $V0 + +cleanup; diff --git a/tests/cluster.rc b/tests/cluster.rc index b734f9d4501..6fd74bc8ba4 100644 --- a/tests/cluster.rc +++ b/tests/cluster.rc @@ -138,3 +138,19 @@ function define_clis() { function peer_count() { $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l } + +function cluster_rebalance_status_field { + #The rebalance status can be upto 3 words, (ex:'fix-layout in progress'), hence the awk-print $7 thru $9. + #But if the status is less than 3 words, it also prints the next field i.e the run_time_in_secs.(ex:'completed 3.00'). + #So we trim the numbers out with `tr`. Finally remove the trailing white spaces with sed. What we get is one of the + #strings in the 'cli_vol_task_status_str' char array of cli-rpc-ops.c + + eval \$CLI_$1 volume rebalance $2 status | awk '{print $7,$8,$9}' |sed -n 3p |tr -d '[^0-9+\.]'|sed 's/ *$//g' +} + +function cluster_volinfo_field() +{ + local vol=$2; + local field=$3; + eval \$CLI_$1 volume info $vol | grep "^$field: " | sed 's/.*: //'; +} -- cgit