diff options
Diffstat (limited to 'tests/basic/multiplex.t')
| -rw-r--r-- | tests/basic/multiplex.t | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/tests/basic/multiplex.t b/tests/basic/multiplex.t index bff3efb0a2c..2f558a6824b 100644 --- a/tests/basic/multiplex.t +++ b/tests/basic/multiplex.t @@ -8,45 +8,53 @@ function count_up_bricks { $CLI --xml volume status $V0 | grep '<status>1' | wc -l } +function count_brick_processes { + pgrep glusterfsd | wc -l +} + function count_brick_pids { $CLI --xml volume status $V0 | sed -n '/.*<pid>\([^<]*\).*/s//\1/p' \ | grep -v "N/A" | sort | uniq | wc -l } +cleanup + TEST glusterd -TEST $CLI volume set all cluster.brick-multiplex yes -push_trapfunc "$CLI volume set all cluster.brick-multiplex off" -push_trapfunc "cleanup" +TEST $CLI volume set all cluster.brick-multiplex on + TEST $CLI volume create $V0 $H0:$B0/brick{0,1} +TEST $CLI volume set $V0 features.trash enable TEST $CLI volume start $V0 # Without multiplexing, there would be two. EXPECT_WITHIN $PROCESS_UP_TIMEOUT 2 count_up_bricks -EXPECT 1 online_brick_count +EXPECT 1 count_brick_processes TEST $CLI volume stop $V0 -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 0 online_brick_count +#Testing the volume set command introduced for protocol/server +TEST $CLI volume set $V0 transport.listen-backlog 1024 +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 0 count_brick_processes TEST $CLI volume start $V0 EXPECT_WITHIN $PROCESS_UP_TIMEOUT 2 count_up_bricks -EXPECT 1 online_brick_count +EXPECT 1 count_brick_processes TEST kill_brick $V0 $H0 $B0/brick1 EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 1 count_up_bricks # Make sure the whole process didn't go away. -EXPECT 1 online_brick_count +EXPECT 1 count_brick_processes TEST $CLI volume start $V0 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT 2 count_up_bricks -EXPECT 1 online_brick_count +EXPECT 1 count_brick_processes # Killing the first brick is a bit more of a challenge due to socket-path # issues. TEST kill_brick $V0 $H0 $B0/brick0 EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 1 count_up_bricks -EXPECT 1 online_brick_count +EXPECT 1 count_brick_processes TEST $CLI volume start $V0 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT 2 count_up_bricks -EXPECT 1 online_brick_count +EXPECT 1 count_brick_processes # Make sure that the two bricks show the same PID. EXPECT 1 count_brick_pids @@ -61,3 +69,10 @@ nbrick0=$(ls $B0/brick0/file?? | wc -l) nbrick1=$(ls $B0/brick1/file?? | wc -l) TEST [ $((nbrick0 + nbrick1)) -eq 90 ] TEST [ $((nbrick0 * nbrick1)) -ne 0 ] + +pkill gluster +TEST glusterd +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 1 count_brick_pids +EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 1 count_brick_processes + +cleanup;
\ No newline at end of file |