summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Lange <greglange@gmail.com>2011-04-13 19:30:21 +0000
committerGreg Lange <greglange@gmail.com>2011-04-13 19:30:21 +0000
commitf32ef0f477e5f4c7aa6ca1a8feae421bb3aa6103 (patch)
tree349c3762fe589404cb47a80c402b90292ace4e43
parent6cf87bbec4c001e6b527f2dc815f150fc4c9b488 (diff)
downloadswift-bench-f32ef0f477e5f4c7aa6ca1a8feae421bb3aa6103.tar.gz
swift-bench now deletes containers it makes if deleting of objects is requested
-rw-r--r--swift/common/bench.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/swift/common/bench.py b/swift/common/bench.py
index 482c2d7..e1466ee 100644
--- a/swift/common/bench.py
+++ b/swift/common/bench.py
@@ -103,6 +103,13 @@ class Bench(object):
finally:
self.conn_pool.put(hc)
+ def delete_containers(self):
+ for container in self.containers:
+ try:
+ client.delete_container(self.url, self.token, container)
+ except client.ClientException, e:
+ pass
+
def run(self):
pool = eventlet.GreenPool(self.concurrency)
events = []
@@ -137,6 +144,7 @@ class BenchController(object):
if self.delete:
dels = BenchDELETE(self.logger, self.conf, self.names)
dels.run()
+ dels.delete_containers()
class BenchDELETE(Bench):