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/features/fdl-overflow.t | 2 ++ tests/features/fdl.t | 2 ++ tests/features/recon.t | 2 ++ tests/features/ssl-ciphers.t | 8 +++----- tests/features/trash.t | 3 +++ 5 files changed, 12 insertions(+), 5 deletions(-) (limited to 'tests/features') diff --git a/tests/features/fdl-overflow.t b/tests/features/fdl-overflow.t index fd4bb951c5a..34b941d2f2a 100644 --- a/tests/features/fdl-overflow.t +++ b/tests/features/fdl-overflow.t @@ -68,3 +68,5 @@ TEST $CLI volume stop $V0 TEST _check_sizes cleanup +#G_TESTDEF_TEST_STATUS_CENTOS6=KNOWN_ISSUE,BUG=1385758 +#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=1385758 diff --git a/tests/features/fdl.t b/tests/features/fdl.t index 28097a1536a..5a3c13fc850 100644 --- a/tests/features/fdl.t +++ b/tests/features/fdl.t @@ -40,3 +40,5 @@ TEST check_logfile GF_FOP_UNLINK 1 TEST check_logfile GF_FOP_RMDIR 2 cleanup +#G_TESTDEF_TEST_STATUS_CENTOS6=KNOWN_ISSUE,BUG=1385758 +#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=1385758 diff --git a/tests/features/recon.t b/tests/features/recon.t index 4fdae3bdd0d..82ef6fd755d 100644 --- a/tests/features/recon.t +++ b/tests/features/recon.t @@ -55,3 +55,5 @@ EXPECT "peekaboo" cat ${B0}/${V0}-0/abc/def/ghi # TBD: test permissions, xattrs cleanup +#G_TESTDEF_TEST_STATUS_CENTOS6=KNOWN_ISSUE,BUG=1385758 +#G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=1385758 diff --git a/tests/features/ssl-ciphers.t b/tests/features/ssl-ciphers.t index f5909f320ac..563d37c5277 100644 --- a/tests/features/ssl-ciphers.t +++ b/tests/features/ssl-ciphers.t @@ -4,11 +4,7 @@ . $(dirname $0)/../volume.rc brick_port() { - $CLI volume status $1 | awk ' - ($3 == "") { p = $0; next; } - { $0 = p $0; p = ""; } - /^Brick/ { print $3; } - ' + $CLI --xml volume status $1 | sed -n '/.*\([0-9]*\).*/s//\1/p' } wait_mount() { @@ -37,6 +33,8 @@ wait_mount() { openssl_connect() { ssl_opt="-verify 3 -verify_return_error -CAfile $SSL_CA" ssl_opt="$ssl_opt -crl_check_all -CApath $TMPDIR" + #echo openssl s_client $ssl_opt $@ > /dev/tty + #read -p "Continue? " nothing CIPHER=`echo "" | openssl s_client $ssl_opt $@ 2>/dev/null | awk '/^ Cipher/{print $3}'` diff --git a/tests/features/trash.t b/tests/features/trash.t index 620b84f0da1..88505d3a148 100755 --- a/tests/features/trash.t +++ b/tests/features/trash.t @@ -247,3 +247,6 @@ mv $M0/abc $M0/trash TEST [ -e $M0/abc ] cleanup + +#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=1385758 +#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=1385758 -- cgit