openstack/cinder
Code Issues Proposed changes

Merge "[stable-only] Fix online data migrations" into unmaintained/2023.1

Browse Source
This commit is contained in:
Zuul
2025-08-13 10:08:16 +00:00
committed by Gerrit Code Review
parent 3ad10ba99a a3c90fb4cd
commit 1c00d6490d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/db/sqlalchemy/api.py
View File

@@ -8704,9 +8704,8 @@ def use_quota_online_data_migration(
calculate_use_quota, calculate_use_quota,
): ):
updated = 0 updated = 0
query = model_query(context, getattr(models, resource_name)).filter_by( query = model_query(context, getattr(models, resource_name),
use_quota=None read_deleted='yes').filter_by(use_quota=None)
)
if resource_name == 'Volume': if resource_name == 'Volume':
query = query.options(joinedload(models.Volume.volume_admin_metadata)) query = query.options(joinedload(models.Volume.volume_admin_metadata))
total = query.count() total = query.count()

3
cinder/tests/unit/test_db_api.py
View File

@@ -4018,7 +4018,8 @@ class OnlineMigrationTestCase(BaseTest):
calculate_method) calculate_method)
query_mock.assert_called_once_with(self.ctxt, query_mock.assert_called_once_with(self.ctxt,
models_mock.resource_name) models_mock.resource_name,
read_deleted='yes')
query_mock.return_value.filter_by.assert_called_once_with( query_mock.return_value.filter_by.assert_called_once_with(
use_quota=None) use_quota=None)
query.count.assert_called_once_with() query.count.assert_called_once_with()