From 82c0996d48156465980efb6898764c2bb270faaf Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Tue, 16 Jul 2013 07:16:07 +0000 Subject: [PATCH] Disable fallocate and set max_file_size to default - We used to set max_file_size to 10000 to get the functional tests passing on devstack but this was the wrong way. We are now disabling fallocate like done in saio to get the large objects test passing. - Fixes bug 1201077. Change-Id: I33058352f5abfb06f2a992890cbc7339cedc0ad3 --- lib/swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/swift b/lib/swift index f537989f98..e85cdad36d 100644 --- a/lib/swift +++ b/lib/swift @@ -242,6 +242,9 @@ EOF iniuncomment ${swift_node_config} DEFAULT log_facility iniset ${swift_node_config} DEFAULT log_facility LOG_LOCAL${log_facility} + iniuncomment ${swift_node_config} DEFAULT disable_fallocate + iniset ${swift_node_config} DEFAULT disable_fallocate true + iniuncomment ${swift_node_config} DEFAULT mount_check iniset ${swift_node_config} DEFAULT mount_check false @@ -286,12 +289,6 @@ EOF iniset ${testfile} func_test account2 swifttenanttest2 iniset ${testfile} func_test username2 swiftusertest2 - # Set maximum file size to 10000 bytes or our vm will fill up quickly with - # the default 5gb size. - iniuncomment ${testfile} func_test max_file_size - iniset ${testfile} func_test max_file_size 10000 - - if is_service_enabled key;then iniuncomment ${testfile} func_test auth_version iniset ${testfile} func_test auth_host ${KEYSTONE_SERVICE_HOST}