diff options
Diffstat (limited to 'tests/cluster.rc')
| -rwxr-xr-x | tests/cluster.rc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/cluster.rc b/tests/cluster.rc index 1c06bca47..3b10d19f7 100755 --- a/tests/cluster.rc +++ b/tests/cluster.rc @@ -45,8 +45,10 @@ function define_glusterds() { wopt="management.working-directory=${!b}/glusterd"; bopt="management.transport.socket.bind-address=${!h}"; popt="--pid-file=${!b}/glusterd.pid"; - eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt $popt'"; - eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt $popt'"; + sopt="management.glusterd-sockfile=${!b}/glusterd/gd.sock" + lopt="--log-file=${!b}/glusterd.log" + eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'"; + eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'"; done } @@ -98,9 +100,13 @@ function define_clis() { local h; for i in `seq 1 $count`; do - h="H$i"; - eval "CLI_$i='$CLI --remote-host=${!h}'"; - eval "CLI$i='$CLI --remote-host=${!h}'"; + b="B$i"; + eval "CLI_$i='$CLI --glusterd-sock=${!b}/glusterd/gd.sock'"; + eval "CLI$i='$CLI --glusterd-sock=${!b}/glusterd/gd.sock'"; done + CLI="$CLI_1" } +function peer_count() { + $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l +} |