summaryrefslogtreecommitdiffstats
path: root/tests/features/ssl-ciphers.t
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2016-12-08 16:24:15 -0500
committergluster-ant <bugzilla-bot@gluster.org>2016-12-08 16:24:15 -0500
commit19d398640094b0ea2b7d89b66034711cb98d38f0 (patch)
tree0ebc8426b71a19dbe663f1e71a7a397a4adcdd6f /tests/features/ssl-ciphers.t
parenta9283490c1ea9c5ac74e52ee1bd1eb8250f8fb04 (diff)
downloadglusterfs-19d398640094b0ea2b7d89b66034711cb98d38f0.tar.gz
glusterfs-19d398640094b0ea2b7d89b66034711cb98d38f0.tar.xz
glusterfs-19d398640094b0ea2b7d89b66034711cb98d38f0.zip
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 <jdarcy@redhat.com> Reviewed-on: https://review.gluster.org/14763 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: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/features/ssl-ciphers.t')
-rw-r--r--tests/features/ssl-ciphers.t8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/features/ssl-ciphers.t b/tests/features/ssl-ciphers.t
index f5909f320a..563d37c527 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 '/.*<port>\([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}'`