openstack
/
nova
Code Issues Proposed changes

Clarify which context is used by do_query() 

In get_records_sorted() we define a closure for convenience, which
takes a targeted cell context. That is actually named the same as
the context provided to get_records_sorted() itself and eclipses it.
That is likely to confuse someone at some point, this makes it
use the "child context" or "cctx" convention for clarity.

This is just a refactor - no test change means it works.

Change-Id: I9b48400fa1daeb641553681019a5bb894e98a2c9
This commit is contained in:
Dan Smith 2018-08-22 07:52:57 -07:00
parent d7036f2f36
commit e6e5e48c07
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/multi_cell_list.py
View File

@ -176,7 +176,7 @@ class CrossCellLister(object):
global_marker_values = [global_marker_record[key]
for key in self.sort_ctx.sort_keys]
def do_query(ctx):
def do_query(cctx):
"""Generate RecordWrapper(record) objects from a cell.
We do this inside the thread (created by
@ -205,7 +205,7 @@ class CrossCellLister(object):
# FIXME(danms): If we knew which cell we were in here, we could
# avoid looking up the marker again. But, we don't currently.
local_marker = self.get_marker_by_values(ctx,
local_marker = self.get_marker_by_values(cctx,
global_marker_values)
if local_marker:
if local_marker != marker:
@ -230,7 +230,7 @@ class CrossCellLister(object):
# expected.
local_marker_filters[marker_id] = [local_marker]
local_marker_prefix = self.get_by_filters(
ctx, local_marker_filters, limit=1, marker=None,
cctx, local_marker_filters, limit=1, marker=None,
**kwargs)
else:
# There was a global marker but everything in our
@ -241,11 +241,11 @@ class CrossCellLister(object):
return []
main_query_result = self.get_by_filters(
ctx, filters,
cctx, filters,
limit=limit, marker=local_marker,
**kwargs)
return (RecordWrapper(ctx, self.sort_ctx, inst) for inst in
return (RecordWrapper(cctx, self.sort_ctx, inst) for inst in
itertools.chain(local_marker_prefix, main_query_result))
# NOTE(tssurya): When the below routine provides sentinels to indicate