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

Author: Zuul

cinder/db/sqlalchemy/api.py

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

cinder/tests/unit/test_db_api.py

@@ -4018,7 +4018,8 @@ def test_use_quota_online_data_migration(self, query_mock, models_mock):
             calculate_method)
 
         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(
             use_quota=None)
         query.count.assert_called_once_with()