diff options
author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-05-05 09:41:23 +0200 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-05 07:49:37 -0700 |
commit | a197943463d3913707de56e3a1a9ef68bba5901f (patch) | |
tree | 4b3bb84984b2f6572703cff9a9da2189de099a7c | |
parent | 170cc4ea08aa48e69c2df6be5841076c9a119d5a (diff) |
Tests: wworkaround NetBSD failures in cdc.t
The volume reset network.compression operation cause brick processes to
be restarted. If the volume is already started, a brick process is already
there and the restart will fail, as the brick TCP port is already in use.
Because the new brick process is not started, the volume is left with
no brick online, and the volume stop operation will timeout waiting
for bricks to stop.
Obviosuly we have two bugs here
- If volume reset network.compression needs to restart the bricks, it
should first make sure the previous brick process is terminated
- volume stop should not wait forever for bricks to come back online
This change does not fix the bugs but just makes sure the volume
is stoped before volume reset network.compression, so that the failure
oes not happen.
BUG: 1129939
Change-Id: I9cd5cdc767ef6ee9dd31f2121d672dc3bfdce45f
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10553
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rwxr-xr-x | tests/basic/cdc.t | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/basic/cdc.t b/tests/basic/cdc.t index 6a80b9287de..8653a77207a 100755 --- a/tests/basic/cdc.t +++ b/tests/basic/cdc.t @@ -132,15 +132,15 @@ TEST ! test -e /tmp/cdcdump.gz TEST rm -f /tmp/cdc* $M0/cdc* EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 +## Stop the volume +TEST $CLI volume stop $V0; +EXPECT 'Stopped' volinfo_field $V0 'Status'; + ## Reset the network.compression options TEST $CLI volume reset $V0 network.compression.debug TEST $CLI volume reset $V0 network.compression.min-size TEST $CLI volume reset $V0 network.compression -## Stop the volume -TEST $CLI volume stop $V0; -EXPECT 'Stopped' volinfo_field $V0 'Status'; - ## Delete the volume TEST $CLI volume delete $V0; TEST ! $CLI volume info $V0; |