summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDarrell Bishop <darrell@swiftstack.com>2013-05-08 14:43:56 -0700
committerDarrell Bishop <darrell@swiftstack.com>2013-05-08 14:43:56 -0700
commita4e6cefa80b9ff0d721bae0af266d64f16366eb5 (patch)
treecc992bec48011b7b5940c2d63b25f83b87f65eba /bin
parent165af3f6037e9528cd306344a0ec647f7f15e551 (diff)
downloadswift-bench-a4e6cefa80b9ff0d721bae0af266d64f16366eb5.tar.gz
Don't delete containers when they weren't created.
When swift-bench is run in direct mode, don't try to delete the containers which weren't created. Fixes bug 1177960. Change-Id: Ice07e8729bb776e2b215894cf95fb80b64167a8d
Diffstat (limited to 'bin')
-rwxr-xr-xbin/swift-bench5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/swift-bench b/bin/swift-bench
index cd216a7..b24345c 100755
--- a/bin/swift-bench
+++ b/bin/swift-bench
@@ -147,7 +147,8 @@ if __name__ == '__main__':
options.del_concurrency = options.concurrency
options.containers = ['%s_%d' % (options.container_name, i)
for i in xrange(int(options.num_containers))]
- # check boolean options vs config parameter values
+
+ # Normalize boolean option to a config parameter value
if config_true_value(str(options.delete).lower()):
options.delete = 'yes'
else:
@@ -181,5 +182,5 @@ if __name__ == '__main__':
controller = controller_class(logger, options)
controller.run()
- if config_true_value(options.delete.lower()):
+ if options.use_proxy and options.delete == 'yes':
delete_containers(logger, options)