vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #336 from coreos-inc/swiftconnectiondrown

Browse source 
Always create a new connection to Swift
This commit is contained in:
Jimmy Zelinskie 2015-08-07 13:57:40 -04:00
commit fc74b9569b
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
storage/swift.py
View file

@ -26,14 +26,6 @@ class SwiftStorage(BaseStorage):
self._os_options = os_options or {} self._os_options = os_options or {}
self._initialized = False self._initialized = False
self._swift_connection = None
def _initialize(self):
if self._initialized:
return
self._initialized = True
self._swift_connection = self._get_connection()
def _get_connection(self): def _get_connection(self):
return Connection( return Connection(
@ -69,14 +61,13 @@ class SwiftStorage(BaseStorage):
return path return path
def _get_container(self, path): def _get_container(self, path):
self._initialize()
path = self._normalize_path(path) path = self._normalize_path(path)
if path and not path.endswith('/'): if path and not path.endswith('/'):
path += '/' path += '/'
try: try:
_, container = self._swift_connection.get_container( _, container = self._get_connection().get_container(
container=self._swift_container, container=self._swift_container,
prefix=path, delimiter='/') prefix=path, delimiter='/')
return container return container
@ -85,10 +76,9 @@ class SwiftStorage(BaseStorage):
raise IOError('Unknown path: %s' % path) raise IOError('Unknown path: %s' % path)
def _get_object(self, path, chunk_size=None): def _get_object(self, path, chunk_size=None):
self._initialize()
path = self._normalize_path(path) path = self._normalize_path(path)
try: try:
_, obj = self._swift_connection.get_object(self._swift_container, path, _, obj = self._get_connection().get_object(self._swift_container, path,
resp_chunk_size=chunk_size) resp_chunk_size=chunk_size)
return obj return obj
except Exception: except Exception:
@ -96,7 +86,6 @@ class SwiftStorage(BaseStorage):
raise IOError('Path %s not found' % path) raise IOError('Path %s not found' % path)
def _put_object(self, path, content, chunk=None, content_type=None, content_encoding=None): def _put_object(self, path, content, chunk=None, content_type=None, content_encoding=None):
self._initialize()
path = self._normalize_path(path) path = self._normalize_path(path)
headers = {} headers = {}
@ -104,7 +93,7 @@ class SwiftStorage(BaseStorage):
headers['Content-Encoding'] = content_encoding headers['Content-Encoding'] = content_encoding
try: try:
self._swift_connection.put_object(self._swift_container, path, content, self._get_connection().put_object(self._swift_container, path, content,
chunk_size=chunk, content_type=content_type, chunk_size=chunk, content_type=content_type,
headers=headers) headers=headers)
except ClientException: except ClientException:
@ -116,10 +105,9 @@ class SwiftStorage(BaseStorage):
raise IOError("Could not put content: %s" % path) raise IOError("Could not put content: %s" % path)
def _head_object(self, path): def _head_object(self, path):
self._initialize()
path = self._normalize_path(path) path = self._normalize_path(path)
try: try:
return self._swift_connection.head_object(self._swift_container, path) return self._get_connection().head_object(self._swift_container, path)
except Exception: except Exception:
logger.exception('Could not head object: %s', path) logger.exception('Could not head object: %s', path)
return None return None
@ -171,10 +159,9 @@ class SwiftStorage(BaseStorage):
return bool(self._head_object(path)) return bool(self._head_object(path))
def remove(self, path): def remove(self, path):
self._initialize()
path = self._normalize_path(path) path = self._normalize_path(path)
try: try:
self._swift_connection.delete_object(self._swift_container, path) self._get_connection().delete_object(self._swift_container, path)
except Exception: except Exception:
raise IOError('Cannot delete path: %s' % path) raise IOError('Cannot delete path: %s' % path)