openstack/zaqar
Code Issues Proposed changes

swift driver: rely on keystone session for swift connection

Browse Source 
Even though the swiftclient can take a token, it doesn't handle
reauthentication properly, and neither does the code in the swift
driver. This is done by the keystone session object, and we should leave
the reauthentication handling there.

We then pass instead the session object to the swift client
connection, avoiding reauthentication issues.

The session is initialized lazily only when the driver is attempted to
be used.

Change-Id: Ie767be7fbe311cfbb9e73fe18641577626880162
This commit is contained in:
Juan Antonio Osorio Robles 2017-04-12 10:37:53 +03:00
parent 7405d6636b
commit dcd7f10a3c
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zaqar/storage/swift/driver.py
View File

@ -88,13 +88,10 @@ class _ClientWrapper(object):
def __init__(self, conf):
self.conf = conf
self.parsed_url = urllib.parse.urlparse(conf.uri)
self.token = None
self.url = None
self.session = None
self.auth = None
def _refresh_auth(self):
self.auth = generic.Password(
def _init_auth(self):
auth = generic.Password(
username=self.parsed_url.username,
password=self.parsed_url.password,
project_name=self.parsed_url.path[1:],
@ -103,18 +100,11 @@ class _ClientWrapper(object):
project_domain_id=self.conf.project_domain_id,
project_domain_name=self.conf.project_domain_name,
auth_url=self.conf.auth_url)
self.session = keystone_session.Session(auth=self.auth)
self.url = self.session.get_endpoint(service_type='object-store')
self.token = self.session.get_token()
self.session = keystone_session.Session(auth=auth)
def __getattr__(self, attr):
# This part is not thread-safe, but the worst case is having a bunch of
# useless auth calls, so it should be okay.
if (self.auth is None or
self.auth.get_auth_ref(self.session).will_expire_soon()):
self._refresh_auth()
client = swiftclient.Connection(
preauthurl=self.url,
preauthtoken=self.token,
if self.session is None:
self._init_auth()
client = swiftclient.Connection(session=self.session,
insecure=self.conf.insecure)
return getattr(client, attr)