From 5f295d032933d035b973f8f1f0a90f47b249d571 Mon Sep 17 00:00:00 2001 From: Darrell Bishop Date: Wed, 8 May 2013 14:43:56 -0700 Subject: [PATCH] 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 --- bin/swift-bench | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/swift-bench b/bin/swift-bench index cd216a7041..b24345c873 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)