summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChetan Risbud <crisbud@redhat.com>2013-07-09 16:24:44 +0530
committerLuis Pabon <lpabon@redhat.com>2013-07-10 12:32:32 -0700
commitf8d876248d29fa7f4857ac8ca02324795ba53353 (patch)
treefe89d5de2f23cfa8f5c73cf663648bb098b78294
parent13959e281704d30f6e7762bdd490cdf3bf31bdff (diff)
Disable fallocate for Gluster volumes
The overridden configuration files of gluster now disable the usage of fallocate. Also modified the functional test configuration files accordingly. BUG: 951661 Change-Id: I3c7d518e0415b7eea5b31c88dd647069f9d730ac Signed-off-by: Chetan Risbud <crisbud@redhat.com> Signed-off-by: Luis Pabon <lpabon@redhat.com> Reviewed-on: http://review.gluster.org/5303
-rw-r--r--etc/account-server.conf-gluster2
-rw-r--r--etc/container-server.conf-gluster2
-rw-r--r--etc/object-server.conf-gluster2
-rw-r--r--test/functional/conf/account-server.conf2
-rw-r--r--test/functional/conf/container-server.conf2
-rw-r--r--test/functional/conf/object-server.conf2
6 files changed, 12 insertions, 0 deletions
diff --git a/etc/account-server.conf-gluster b/etc/account-server.conf-gluster
index 420f54d..b47680a 100644
--- a/etc/account-server.conf-gluster
+++ b/etc/account-server.conf-gluster
@@ -4,6 +4,8 @@ mount_check = true
bind_port = 6012
user = root
log_facility = LOG_LOCAL2
+# Override swift's default behaviour for fallocate.
+disable_fallocate = true
[pipeline:main]
pipeline = account-server
diff --git a/etc/container-server.conf-gluster b/etc/container-server.conf-gluster
index 21477dc..2f488f1 100644
--- a/etc/container-server.conf-gluster
+++ b/etc/container-server.conf-gluster
@@ -4,6 +4,8 @@ mount_check = true
bind_port = 6011
user = root
log_facility = LOG_LOCAL2
+# Override swift's default behaviour for fallocate.
+disable_fallocate = true
[pipeline:main]
pipeline = container-server
diff --git a/etc/object-server.conf-gluster b/etc/object-server.conf-gluster
index effecd1..9c87b2c 100644
--- a/etc/object-server.conf-gluster
+++ b/etc/object-server.conf-gluster
@@ -5,6 +5,8 @@ bind_port = 6010
# 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
+# Override swift's default behaviour for fallocate.
+disable_fallocate = true
[pipeline:main]
pipeline = object-server
diff --git a/test/functional/conf/account-server.conf b/test/functional/conf/account-server.conf
index 96f3bd7..72fa537 100644
--- a/test/functional/conf/account-server.conf
+++ b/test/functional/conf/account-server.conf
@@ -4,6 +4,8 @@ mount_check = false
bind_port = 6012
user = root
log_facility = LOG_LOCAL2
+# Override swift's default behaviour for fallocate.
+disable_fallocate = true
[pipeline:main]
pipeline = account-server
diff --git a/test/functional/conf/container-server.conf b/test/functional/conf/container-server.conf
index 4654883..6d30f02 100644
--- a/test/functional/conf/container-server.conf
+++ b/test/functional/conf/container-server.conf
@@ -4,6 +4,8 @@ mount_check = false
bind_port = 6011
user = root
log_facility = LOG_LOCAL2
+# Override swift's default behaviour for fallocate.
+disable_fallocate = true
[pipeline:main]
pipeline = container-server
diff --git a/test/functional/conf/object-server.conf b/test/functional/conf/object-server.conf
index d11705c..dbce0f9 100644
--- a/test/functional/conf/object-server.conf
+++ b/test/functional/conf/object-server.conf
@@ -5,6 +5,8 @@ bind_port = 6010
# 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
+# Override swift's default behaviour for fallocate.
+disable_fallocate = true
[pipeline:main]
pipeline = object-server