dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

Merge pull request #345 from huangp0600/hp-dev

Browse source 
Fix: Bucket resource leak when cleanup
This commit is contained in:
Ali Maredia 2020-05-15 15:19:42 -04:00 • committed by GitHub
commit 7f8a12423f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
s3tests_boto3/functional/__init__.py
View file

@ -113,6 +113,7 @@ def nuke_prefixed_buckets(prefix, client=None):
buckets = get_buckets_list(client, prefix) buckets = get_buckets_list(client, prefix)
err = None
if buckets != []: if buckets != []:
for bucket_name in buckets: for bucket_name in buckets:
objects_list = get_objects_list(bucket_name, client) objects_list = get_objects_list(bucket_name, client)
@ -126,11 +127,15 @@ def nuke_prefixed_buckets(prefix, client=None):
response = client.delete_object(Bucket=bucket_name,Key=obj[0],VersionId=obj[1]) response = client.delete_object(Bucket=bucket_name,Key=obj[0],VersionId=obj[1])
try: try:
response = client.delete_bucket(Bucket=bucket_name) response = client.delete_bucket(Bucket=bucket_name)
except ClientError: except ClientError as e:
# if DELETE times out, the retry may see NoSuchBucket # The exception shouldn't be raised when doing cleanup. Pass and continue
if response['Error']['Code'] != 'NoSuchBucket': # the bucket cleanup process. Otherwise left buckets wouldn't be cleared
raise ClientError # resulting in some kind of resource leak. err is used to hint user some
# exception once occurred.
err = e
pass pass
if err:
raise err
print('Done with cleanup of buckets in tests.') print('Done with cleanup of buckets in tests.')