From 07372c3729578cd8580209eac3ea7a981efeba3e Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Tue, 27 Feb 2018 11:33:30 +0530 Subject: tests/basic/namespace: Check if brick multiplex is enabled This patch fixes the namespace test failure when brick multiplexing is enabled. By changing the log file name, when brick multiplexing is enabled. As only one log file generated for all bricks. Change-Id: Ide941946e5e1b2676e7139e1b5bf6b93b93c0815 Signed-off-by: Varsha Rao --- tests/basic/namespace.t | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'tests') diff --git a/tests/basic/namespace.t b/tests/basic/namespace.t index ea473abbc1c..7f4fe2c9268 100644 --- a/tests/basic/namespace.t +++ b/tests/basic/namespace.t @@ -10,12 +10,35 @@ NAMESPACE_HASH=28153613 NAMESPACE2_HASH=3926991974 NAMESPACE3_HASH=3493960770 +function check_brick_multiplex() { + $CLI volume info|grep "cluster.brick-multiplex" &>/dev/null + rt=$? + cnt="$(ls /var/log/glusterfs/bricks|wc -l)" + + if [ $rt -eq 0 ]; then + local ret=$($CLI volume info|grep "cluster.brick-multiplex"|cut -d" " -f2) + + if [ $ret = "on" ] || [ $cnt -eq 1 ]; then + echo "Y" + else + echo "N" + fi + else + echo "N" + fi +} + function check_samples() { local FOP_TYPE=$1 local NS_HASH=$2 local FILE=$3 local BRICK=$4 local GFID="$(getfattr -n trusted.gfid -e text --only-values $B0/$BRICK$FILE | xxd -p)" + local val="$(check_brick_multiplex)" + + if [ $val = "Y" ]; then + BRICK="${V0}0" + fi grep -i "ns_$OP" /var/log/glusterfs/bricks/d-backends-$BRICK.log | grep -- $NS_HASH | sed 's/\-//g' | grep -- $GFID -- cgit