diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2017-02-02 10:22:00 -0500 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-02-08 15:03:37 -0500 |
| commit | 0b3255e0ce1d4d407467b34f7d6ad91161b43cfc (patch) | |
| tree | 4f698f7bed356da2eb10fd55c5f0a0d08ed3d188 /tests/basic | |
| parent | e576a061c394dea5a665ea8a6185831fe13d4af7 (diff) | |
tests: fix online_brick_count for multiplexing
The number of brick processes no longer matches the number of bricks,
therefore counting processes doesn't work. Counting *pidfiles* does.
Ironically, the fix broke multiplex.t which used this function, so it
now uses a different function with the old process-counting behavior.
Also had to fix online_brick_count and kill_node in cluster.rc to be
consistent with the new reality.
Backport of:
> Change-Id: I4e81a6633b93227e10604f53e18a0b802c75cbcc
> BUG: 1385758
> Reviewed-on: https://review.gluster.org/16527
Change-Id: I70b5cd169eafe3ad5b523bc0a30d21d864b3036a
BUG: 1418091
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: https://review.gluster.org/16565
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'tests/basic')
| -rw-r--r-- | tests/basic/multiplex.t | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/basic/multiplex.t b/tests/basic/multiplex.t index bff3efb0a2c..d503bf5a232 100644 --- a/tests/basic/multiplex.t +++ b/tests/basic/multiplex.t @@ -8,6 +8,10 @@ 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 @@ -22,31 +26,31 @@ TEST $CLI volume create $V0 $H0:$B0/brick{0,1} 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 +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 |