summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2013-07-08 14:10:45 -0400
committerLuis Pabon <lpabon@redhat.com>2013-07-10 15:49:26 -0700
commit677d30716978615d0499344ac0a62c2755a486cf (patch)
treeb86a156f120bdcd6f10d6b9998ef20b80cf50639 /test/functional
parentf8d876248d29fa7f4857ac8ca02324795ba53353 (diff)
Final forward port of PDQ performance patches
Change-Id: I4ef131b3cc7648d4571a4d854029efb1aff8b901 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/5305 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/conf/account-server.conf21
-rw-r--r--test/functional/conf/container-server.conf21
-rw-r--r--test/functional/conf/fs.conf7
-rw-r--r--test/functional/conf/object-server.conf34
-rw-r--r--test/functional/conf/proxy-server.conf1
5 files changed, 68 insertions, 16 deletions
diff --git a/test/functional/conf/account-server.conf b/test/functional/conf/account-server.conf
index 72fa537..3290cf2 100644
--- a/test/functional/conf/account-server.conf
+++ b/test/functional/conf/account-server.conf
@@ -1,17 +1,34 @@
[DEFAULT]
devices = /mnt/gluster-object
+#
+# Once you are confident that your startup processes will always have your
+# gluster volumes properly mounted *before* the account-server workers start,
+# you can *consider* setting this value to "false" to reduce the per-request
+# overhead it can incur.
+#
+# *** Keep false for Functional Tests ***
mount_check = false
bind_port = 6012
-user = root
-log_facility = LOG_LOCAL2
+#
# Override swift's default behaviour for fallocate.
disable_fallocate = true
+#
+# One or two workers should be sufficient for almost any installation of
+# Gluster.
+workers = 1
[pipeline:main]
pipeline = account-server
[app:account-server]
use = egg:gluster_swift#account
+user = root
+log_facility = LOG_LOCAL2
+#
+# After ensuring things are running in a stable manner, you can turn off
+# normal request logging for the account server to unclutter the log
+# files. Warnings and errors will still be logged.
+log_requests = on
[account-replicator]
vm_test_mode = yes
diff --git a/test/functional/conf/container-server.conf b/test/functional/conf/container-server.conf
index 6d30f02..ad8a447 100644
--- a/test/functional/conf/container-server.conf
+++ b/test/functional/conf/container-server.conf
@@ -1,17 +1,34 @@
[DEFAULT]
devices = /mnt/gluster-object
+#
+# Once you are confident that your startup processes will always have your
+# gluster volumes properly mounted *before* the container-server workers
+# start, you can *consider* setting this value to "false" to reduce the
+# per-request overhead it can incur.
+#
+# *** Keep false for Functional Tests ***
mount_check = false
bind_port = 6011
-user = root
-log_facility = LOG_LOCAL2
+#
# Override swift's default behaviour for fallocate.
disable_fallocate = true
+#
+# One or two workers should be sufficient for almost any installation of
+# Gluster.
+workers = 1
[pipeline:main]
pipeline = container-server
[app:container-server]
use = egg:gluster_swift#container
+user = root
+log_facility = LOG_LOCAL2
+#
+# After ensuring things are running in a stable manner, you can turn off
+# normal request logging for the container server to unclutter the log
+# files. Warnings and errors will still be logged.
+log_requests = on
[container-replicator]
vm_test_mode = yes
diff --git a/test/functional/conf/fs.conf b/test/functional/conf/fs.conf
index b54cdf1..43f9b45 100644
--- a/test/functional/conf/fs.conf
+++ b/test/functional/conf/fs.conf
@@ -1,6 +1,7 @@
[DEFAULT]
-# IP address of a GlusterFS volume server member. By default, we assume the
-# local host.
+#
+# IP address of a node in the GlusterFS server cluster hosting the
+# volumes to be served via Swift API.
mount_ip = localhost
# By default it is assumed the Gluster volumes can be accessed using other
@@ -14,4 +15,6 @@ object_only = yes
# numbers of objects, at the expense of an accurate count of combined bytes
# used by all objects in the container. For most installations "off" works
# fine.
+#
+# *** Keep on for Functional Tests ***
accurate_size_in_listing = on
diff --git a/test/functional/conf/object-server.conf b/test/functional/conf/object-server.conf
index dbce0f9..e9088ba 100644
--- a/test/functional/conf/object-server.conf
+++ b/test/functional/conf/object-server.conf
@@ -1,7 +1,22 @@
[DEFAULT]
devices = /mnt/gluster-object
+#
+# Once you are confident that your startup processes will always have your
+# gluster volumes properly mounted *before* the object-server workers start,
+# you can *consider* setting this value to "false" to reduce the per-request
+# overhead it can incur.
+#
+# *** Keep false for Functional Tests ***
mount_check = false
bind_port = 6010
+#
+# Maximum number of clients one worker can process simultaneously (it will
+# actually accept N + 1). Setting this to one (1) will only handle one request
+# at a time, without accepting another request concurrently. By increasing the
+# number of workers to a much higher value, one can prevent slow file system
+# operations for one request from starving other requests.
+max_clients = 1024
+#
# If not doing the above, setting this value initially to match the number of
# CPUs is a good starting point for determining the right value.
workers = 1
@@ -15,19 +30,20 @@ pipeline = object-server
use = egg:gluster_swift#object
user = root
log_facility = LOG_LOCAL2
-# Timeout clients that don't read or write to the proxy server after 5
-# seconds.
-conn_timeout = 5
-# For high load situations, once connected to a container server, allow for
-# delays communicating with it.
-node_timeout = 60
+#
+# For performance, after ensuring things are running in a stable manner, you
+# can turn off normal request logging for the object server to reduce the
+# per-request overhead and unclutter the log files. Warnings and errors will
+# still be logged.
+log_requests = on
+#
# Adjust this value to match the stripe width of the underlying storage array
# (not the stripe element size). This will provide a reasonable starting point
# for tuning this value.
disk_chunk_size = 65536
-# Adjust this value match whatever is set for the disk_chunk_size
-# initially. This will provide a reasonable starting point for tuning this
-# value.
+#
+# Adjust this value match whatever is set for the disk_chunk_size initially.
+# This will provide a reasonable starting point for tuning this value.
network_chunk_size = 65556
[object-replicator]
diff --git a/test/functional/conf/proxy-server.conf b/test/functional/conf/proxy-server.conf
index ded2659..54b9814 100644
--- a/test/functional/conf/proxy-server.conf
+++ b/test/functional/conf/proxy-server.conf
@@ -1,7 +1,6 @@
[DEFAULT]
bind_port = 8080
user = root
-log_facility = LOG_LOCAL1
# Consider using 1 worker per CPU
workers = 1