andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: address test failures with brick mux enabled

Browse Source 
This patch addresses following:
1. On volume stop, for the last brick, pmap_registry_remove () is
invoked by glusterd.
2. If a brick process is sigkilled, remove all the associated brick
instances from the portmap.
3. Bump up PROCESS_UP_TIMEOUT to 45.
4. gf_attach to kill a brick takes more time in mux (which is an
issue that needs a fix), but in the interim, give br-state-check.t
more time to complete (there are 2 kill_bricks, each taking 120
seconds, and the test usually passes in 30 odd seconds, hence bumping
this up to 350 seconds)
5. The test bug-1559004-EMLINK-handling.t is taking ~950 seconds at
times on master without mux, in mux cases, when it fails, it is almost
at the last iteration, hence bumping the timeout for this test case
to reduce regression error rates

Updates: bz#1577672
Change-Id: I1922675e112baca4c125c4c094eaa42a11e34e67
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
This commit is contained in:
Atin Mukherjee 2018-05-15 09:22:26 +05:30 committed by Amar Tumballi
parent 430e4872db
commit f1f2bfd7c9
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/bitrot/br-state-check.t
View File

@ -5,6 +5,7 @@
. $(dirname $0)/../nfs.rc
cleanup;
SCRIPT_TIMEOUT=350
TEST glusterd
TEST pidof glusterd

2
tests/bugs/index/bug-1559004-EMLINK-handling.t
View File

@ -6,7 +6,7 @@
cleanup
TESTS_EXPECTED_IN_LOOP=30
SCRIPT_TIMEOUT=1000
SCRIPT_TIMEOUT=1200
TEST glusterd
TEST pidof glusterd

2
tests/include.rc
View File

@ -71,7 +71,7 @@ esac
DEBUG=${DEBUG:=0} # turn on debugging?
PROCESS_DOWN_TIMEOUT=5
PROCESS_UP_TIMEOUT=30
PROCESS_UP_TIMEOUT=45
NFS_EXPORT_TIMEOUT=20
CHILD_UP_TIMEOUT=20
PROBE_TIMEOUT=60

8
xlators/mgmt/glusterd/src/glusterd-handler.c
View File

@ -6031,6 +6031,14 @@ glusterd_mark_bricks_stopped_by_proc (glusterd_brick_proc_t *brick_proc) {
glusterd_set_brick_status (brickinfo_tmp,
GF_BRICK_STOPPED);
brickinfo_tmp->start_triggered = _gf_false;
/* When bricks are stopped, ports also need to
* be cleaned up
*/
pmap_registry_remove (THIS, brickinfo_tmp->port,
brickinfo_tmp->path,
GF_PMAP_PORT_BRICKSERVER,
NULL, _gf_true);
}
}
}

11
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -2508,6 +2508,17 @@ glusterd_volume_stop_glusterfs (glusterd_volinfo_t *volinfo,
if (op_errstr) {
GF_FREE (op_errstr);
}
if (is_brick_mx_enabled ()) {
/* In case of brick multiplexing we need to make
* sure the port is cleaned up from here as the
* RPC connection may not have been originated
* for the same brick instance
*/
pmap_registry_remove (THIS, brickinfo->port,
brickinfo->path,
GF_PMAP_PORT_BRICKSERVER,
NULL, _gf_true);
}
}
(void) glusterd_brick_disconnect (brickinfo);