diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2015-05-19 23:09:42 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-05-24 02:20:19 -0700 |
| commit | b51ee5f8d1f80d66effffc06c1e49099c04014a4 (patch) | |
| tree | 90660d80ca67fb1f22e438be4568f6720b2fac0e /tests/volume.rc | |
| parent | dbad74f1e739c6d1f48b8af392c1eee1a7254015 (diff) | |
tests: arbiter.t fix
Wait for AFR's children to be up in glustershd process before attempting heal.
Also, grep (version 2.21) is detecting statedump files as binary, causing tests
to succeed incorrectly. Hence adding the -a switch to force it to treat it as a
text file. Thanks to Vijay Bellur for identifying the issue
(http://lists.gnu.org/archive/html/bug-grep/2015-05/msg00000.html) and the
workaround.
Change-Id: Ie3d9591ffaf44baa0cd8c2baa327aed24378e3df
BUG: 1163543
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/10833
Tested-by: NetBSD Build System
Tested-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'tests/volume.rc')
| -rw-r--r-- | tests/volume.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/volume.rc b/tests/volume.rc index 5c5e28459c0..9e01fff687d 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -87,7 +87,7 @@ function cleanup_mount_statedump { function snap_client_connected_status { local vol=$1 local fpath=$(generate_mount_statedump $vol) - up=$(grep -A2 xlator.protocol.client.$vol-snapd-client.priv $fpath | tail -1 | cut -f 2 -d'=') + up=$(grep -a -A2 xlator.protocol.client.$vol-snapd-client.priv $fpath | tail -1 | cut -f 2 -d'=') rm -f $fpath echo "$up" } @@ -98,7 +98,7 @@ function _afr_child_up_status { local brick_id=$2 local gen_state_dump=$3 local fpath=$($gen_state_dump $vol) - up=$(grep -B1 trusted.afr.$vol-client-$brick_id $fpath | head -1 | cut -f2 -d'=') + up=$(grep -a -B1 trusted.afr.$vol-client-$brick_id $fpath | head -1 | cut -f2 -d'=') rm -f $fpath echo "$up" } |