openstack/swift
Code Issues Proposed changes

Merge "Delay ring lookup until we know we need it"

Browse Source
This commit is contained in:
Zuul
2020-03-22 05:48:25 +00:00
committed by Gerrit Code Review
parent 9d4dc29fb3 601ced5575
commit ff45353c9e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/proxy/controllers/base.py
View File

@@ -1682,7 +1682,6 @@ class Controller(object):
:returns: tuple of (account partition, account nodes, container_count) :returns: tuple of (account partition, account nodes, container_count)
or (None, None, None) if it does not exist or (None, None, None) if it does not exist
""" """
partition, nodes = self.app.account_ring.get_nodes(account)
if req: if req:
env = getattr(req, 'environ', {}) env = getattr(req, 'environ', {})
else: else:
@@ -1697,6 +1696,7 @@ class Controller(object):
or not info.get('account_really_exists', True)): or not info.get('account_really_exists', True)):
return None, None, None return None, None, None
container_count = info['container_count'] container_count = info['container_count']
partition, nodes = self.app.account_ring.get_nodes(account)
return partition, nodes, container_count return partition, nodes, container_count
def container_info(self, account, container, req=None): def container_info(self, account, container, req=None):
@@ -1713,7 +1713,6 @@ class Controller(object):
and container sync key ('sync_key'). and container sync key ('sync_key').
Values are set to None if the container does not exist. Values are set to None if the container does not exist.
""" """
part, nodes = self.app.container_ring.get_nodes(account, container)
if req: if req:
env = getattr(req, 'environ', {}) env = getattr(req, 'environ', {})
else: else:
@@ -1728,6 +1727,7 @@ class Controller(object):
info['partition'] = None info['partition'] = None
info['nodes'] = None info['nodes'] = None
else: else:
part, nodes = self.app.container_ring.get_nodes(account, container)
info['partition'] = part info['partition'] = part
info['nodes'] = nodes info['nodes'] = nodes
return info return info