Revert "gluster: Sometimes Brick process is crashed at the time of stopping brick"

Updates: bz#1582286
This reverts commit 0043c63f70776444f69667a4ef9596217ecb42b7.
Change-Id: Iab3b4f4a54e122c589e515add93c6effc966b3e0

2 files changed, 3 insertions, 30 deletions

diff --git a/tests/bugs/glusterd/rebalance-operations-in-single-node.t b/tests/bugs/glusterd/rebalance-operations-in-single-node.t
index 9144b4a5000..c0823afebb8 100644
--- a/tests/bugs/glusterd/rebalance-operations-in-single-node.t
+++ b/tests/bugs/glusterd/rebalance-operations-in-single-node.t
@@ -119,7 +119,7 @@ TEST touch $M0/dir{21..30}/files{1..10};
 TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{7,8}
 
 TEST $CLI volume rebalance $V0 start force
-EXPECT_WITHIN 90 "completed" rebalance_status_field $V0
+EXPECT_WITHIN 60 "completed" rebalance_status_field $V0
 
 TEST pkill gluster
 TEST glusterd
diff --git a/tests/volume.rc b/tests/volume.rc
index ea8cfb666a1..44428606711 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -801,53 +801,26 @@ function count_sh_entries()
     ls $1/.glusterfs/indices/xattrop | grep -v "xattrop-" | wc -l
 }
 
-function check_brick_multiplex() {
-        cnt="$(ls /var/log/glusterfs/bricks|wc -l)"
-        local ret=$($CLI volume info|grep "cluster.brick-multiplex"|cut -d" " -f2)
-        local bcnt="$(brick_count)"
-
-        if [ $bcnt -ne 1 ]; then
-           if [ "$ret" = "on" ] || [ $cnt -eq 1 ]; then
-              echo "Y"
-           else
-              echo "N"
-           fi
-        else
-           echo "N"
-        fi
-}
-
 function get_fd_count {
         local vol=$1
         local host=$2
         local brick=$3
         local fname=$4
-        local val="$(check_brick_multiplex)"
         local gfid_str=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $brick/$fname))
         local statedump=$(generate_brick_statedump $vol $host $brick)
-        if [ $val == "N" ]; then
-            count=$(grep "gfid=$gfid_str" $statedump -A2 | grep fd-count | cut -f2 -d'=' | tail -1)
-        else
-            count=$(grep "${brick}.active.1" -A3 $statedump | grep "gfid=$gfid_str" -A2 | grep fd-count | cut -f2 -d'=' | tail -1)
-        fi
+        local count=$(grep "gfid=$gfid_str" $statedump -A2 -B1 | grep $brick -A3 | grep -w fd-count | cut -f2 -d'=' | tail -1)
         rm -f $statedump
         echo $count
 }
 
-
 function get_active_fd_count {
         local vol=$1
         local host=$2
         local brick=$3
         local fname=$4
-        local val="$(check_brick_multiplex)"
         local gfid_str=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $brick/$fname))
         local statedump=$(generate_brick_statedump $vol $host $brick)
-        if [ $val == "N" ]; then
-            count=$(grep "gfid=$gfid_str" $statedump -A2 | grep fd-count | cut -f2 -d'=' | tail -1)
-        else
-            count=$(grep "${brick}.active.1" -A3 $statedump | grep "gfid=$gfid_str" -A2 | grep fd-count | cut -f2 -d'=' | tail -1)
-        fi
+        local count=$(grep "gfid=$gfid_str" $statedump -A2 -B1 | grep $brick -A3 | grep -w active-fd-count | cut -f2 -d'=' | tail -1)
         rm -f $statedump
         echo $count
 }