openstack
/
cinder
Code Issues Proposed changes

Merge "Fix error in cinder-manage quota sync cmd"

This commit is contained in:
Zuul 2024-02-26 19:10:39 +00:00 committed by Gerrit Code Review
parent 647fa0b102 4e511e5b4b
commit 2cb647584a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cinder/cmd/manage.py
View File

@ -341,7 +341,7 @@ class QuotaCommands(object):
pass pass
@args('--project-id', default=None, @args('--project-id', default=None,
help=('The ID of the project where we want to sync the quotas ' help=('The ID of the project where we want to check the quotas '
'(defaults to all projects).')) '(defaults to all projects).'))
def check(self, project_id: Optional[str]) -> None: def check(self, project_id: Optional[str]) -> None:
"""Check if quotas and reservations are correct """Check if quotas and reservations are correct
@ -381,13 +381,13 @@ class QuotaCommands(object):
@db_api.main_context_manager.reader @db_api.main_context_manager.reader
def _get_quota_projects(self, def _get_quota_projects(self,
context: context.RequestContext, ctxt: context.RequestContext,
project_id: Optional[str]) -> list[str]: project_id: Optional[str]) -> list[str]:
"""Get project ids that have quota_usage entries.""" """Get project ids that have quota_usage entries."""
if project_id: if project_id:
model = models.QuotaUsage model = models.QuotaUsage
# If the project does not exist # If the project does not exist
if not context.session.query( if not ctxt.session.query(
db_api.sql.exists() db_api.sql.exists()
.where( .where(
db_api.and_( db_api.and_(
@ -404,7 +404,7 @@ class QuotaCommands(object):
return [project_id] return [project_id]
projects = db_api.model_query( projects = db_api.model_query(
context, ctxt,
models.QuotaUsage, models.QuotaUsage,
read_deleted="no" read_deleted="no"
).with_entities('project_id').distinct().all() ).with_entities('project_id').distinct().all()
@ -417,10 +417,10 @@ class QuotaCommands(object):
project_id: str) -> list: project_id: str) -> list:
"""Get data necessary to check out of sync quota usage. """Get data necessary to check out of sync quota usage.
Returns a list QuotaUsage instances for the specific project Returns a list of QuotaUsage instances for the specific project
""" """
usages = db_api.model_query( usages = db_api.model_query(
context, ctxt,
db_api.models.QuotaUsage, db_api.models.QuotaUsage,
read_deleted="no", read_deleted="no",
).filter_by(project_id=project_id).with_for_update().all() ).filter_by(project_id=project_id).with_for_update().all()
@ -433,7 +433,7 @@ class QuotaCommands(object):
"""Get reservations for a given project and usage id.""" """Get reservations for a given project and usage id."""
reservations = ( reservations = (
db_api.model_query( db_api.model_query(
context, ctxt,
models.Reservation, models.Reservation,
read_deleted="no", read_deleted="no",
) )
@ -444,7 +444,7 @@ class QuotaCommands(object):
return reservations return reservations
def _check_duplicates(self, def _check_duplicates(self,
context: context.RequestContext, ctxt: context.RequestContext,
usages, usages,
do_fix: bool) -> tuple[list, bool]: do_fix: bool) -> tuple[list, bool]:
"""Look for duplicated quota used entries (bug#1484343) """Look for duplicated quota used entries (bug#1484343)
@ -471,7 +471,7 @@ class QuotaCommands(object):
reassigned = 0 reassigned = 0
for usage in resource_usages[1:]: for usage in resource_usages[1:]:
reservations = self._get_reservations( reservations = self._get_reservations(
context, ctxt,
usage.project_id, usage.project_id,
usage.id, usage.id,
) )
@ -480,7 +480,7 @@ class QuotaCommands(object):
reservation.usage_id = keep_usage.id reservation.usage_id = keep_usage.id
keep_usage.in_use += usage.in_use keep_usage.in_use += usage.in_use
keep_usage.reserved += usage.reserved keep_usage.reserved += usage.reserved
usage.delete(context.session) usage.delete(ctxt.session)
print('duplicates removed & %s reservations reassigned' % print('duplicates removed & %s reservations reassigned' %
reassigned) reassigned)
else: else:
@ -515,7 +515,7 @@ class QuotaCommands(object):
@db_api.main_context_manager.reader @db_api.main_context_manager.reader
def _check_project_sync(self, def _check_project_sync(self,
context: context.RequestContext, ctxt: context.RequestContext,
project: str, project: str,
do_fix: bool, do_fix: bool,
resources) -> bool: resources) -> bool:
@ -529,11 +529,11 @@ class QuotaCommands(object):
# running Cinder services. # running Cinder services.
# We only want to sync existing quota usage rows # We only want to sync existing quota usage rows
usages = self._get_usages(context, resources, project) usages = self._get_usages(ctxt, resources, project)
# Check for duplicated entries (bug#1484343) # Check for duplicated entries (bug#1484343)
usages, duplicates_found = self._check_duplicates( usages, duplicates_found = self._check_duplicates(
context, usages, do_fix, ctxt, usages, do_fix,
) )
if duplicates_found: if duplicates_found:
discrepancy = True discrepancy = True
@ -543,7 +543,7 @@ class QuotaCommands(object):
resource_name = usage.resource resource_name = usage.resource
# Get the correct value for this quota usage resource # Get the correct value for this quota usage resource
updates = db_api._get_sync_updates( updates = db_api._get_sync_updates(
context, ctxt,
project, project,
resources, resources,
resource_name, resource_name,
@ -559,7 +559,7 @@ class QuotaCommands(object):
usage.in_use = in_use usage.in_use = in_use
reservations = self._get_reservations( reservations = self._get_reservations(
context, ctxt,
project, project,
usage.id, usage.id,
) )