From 1a95fc3036db51b82b6a80952f0908bc2019d24a Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Thu, 8 Dec 2016 16:24:15 -0500 Subject: core: run many bricks within one glusterfsd process This patch adds support for multiple brick translator stacks running in a single brick server process. This reduces our per-brick memory usage by approximately 3x, and our appetite for TCP ports even more. It also creates potential to avoid process/thread thrashing, and to improve QoS by scheduling more carefully across the bricks, but realizing that potential will require further work. Multiplexing is controlled by the "cluster.brick-multiplex" global option. By default it's off, and bricks are started in separate processes as before. If multiplexing is enabled, then *compatible* bricks (mostly those with the same transport options) will be started in the same process. Change-Id: I45059454e51d6f4cbb29a4953359c09a408695cb BUG: 1385758 Signed-off-by: Jeff Darcy Reviewed-on: https://review.gluster.org/14763 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Vijay Bellur --- tests/include.rc | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'tests/include.rc') diff --git a/tests/include.rc b/tests/include.rc index 4591859cc01..22265755a02 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -69,7 +69,7 @@ esac DEBUG=${DEBUG:=0} # turn on debugging? PROCESS_DOWN_TIMEOUT=5 -PROCESS_UP_TIMEOUT=20 +PROCESS_UP_TIMEOUT=30 NFS_EXPORT_TIMEOUT=20 CHILD_UP_TIMEOUT=20 PROBE_TIMEOUT=60 @@ -91,7 +91,24 @@ statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump CLI="gluster --mode=script --wignore"; CLI_NO_FORCE="gluster --mode-script"; -GFS="glusterfs --attribute-timeout=0 --entry-timeout=0"; +_GFS () { + glusterfs "$@" + local mount_ret=$? + if [ $mount_ret != 0 ]; then + return $mount_ret + fi + local mount_point=${!#} + local i=0 + while true; do + touch $mount_point/xy_zzy 2> /dev/null && break + i=$((i+1)) + [ $i -lt 10 ] || break + sleep 1 + done + rm -f $mount_point/xy_zzy + return $mount_ret +} +GFS="_GFS --attribute-timeout=0 --entry-timeout=0"; mkdir -p $WORKDIRS @@ -180,6 +197,7 @@ function test_footer() echo "FAILED COMMAND: $saved_cmd" fi if [ "$EXIT_EARLY" = "1" ]; then + cleanup exit $RET fi fi -- cgit