openstack
/
glance_store
Code Issues Proposed changes

Raise correct exception from "Quota full" 

Swift driver reraises the client exception causing glance-api
to return 500. Lets raise g_s StoreFull correctly instead.

Change-Id: I5be151afe242a75142e74d488c4787a35929e189
Closes-bug: #1926404
This commit is contained in:
Erno Kuvaja 2021-07-09 14:08:59 +01:00
parent 04e5ead7c0
commit 6a241a20c9
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance_store/_drivers/swift/store.py
View File

@ -1074,6 +1074,8 @@ class BaseStore(driver.Store):
if e.http_status == http_client.CONFLICT:
msg = _("Swift already has an image at this location")
raise exceptions.Duplicate(message=msg)
elif e.http_status == http_client.REQUEST_ENTITY_TOO_LARGE:
raise exceptions.StorageFull(message=e.msg)
msg = (_(u"Failed to add object to Swift.\n"
"Got error from Swift: %s.")

27
glance_store/tests/unit/test_swift_store.py
View File

@ -479,6 +479,33 @@ class SwiftTests(object):
expected_image_id, image_swift, expected_swift_size, HASH_ALGO)
self.assertEqual(expected_location, location)
def test_add_raises_storage_full(self):
conf = copy.deepcopy(SWIFT_CONF)
conf['default_swift_reference'] = 'store_2'
self.config(**conf)
moves.reload_module(swift)
self.mock_keystone_client()
self.store = Store(self.conf)
self.store.configure()
def fake_put_object_entity_too_large(*args, **kwargs):
msg = "Test Out of Quota"
raise swiftclient.ClientException(
msg, http_status=http_client.REQUEST_ENTITY_TOO_LARGE)
self.useFixture(fixtures.MockPatch(
'swiftclient.client.put_object', fake_put_object_entity_too_large))
expected_swift_size = FIVE_KB
expected_swift_contents = b"*" * expected_swift_size
expected_image_id = str(uuid.uuid4())
image_swift = six.BytesIO(expected_swift_contents)
self.assertRaises(exceptions.StorageFull, self.store.add,
expected_image_id, image_swift,
expected_swift_size, HASH_ALGO)
@mock.patch('glance_store._drivers.swift.utils'
'.is_multiple_swift_store_accounts_enabled',
mock.Mock(return_value=False))