Browse Source

Merge "Prevent archiving of pci_devices records because of 'instance_uuid'" into stable/ussuri

Zuul 1 month ago
committed by Gerrit Code Review
2 changed files with 20 additions and 1 deletions
  1. +5
  2. +15

+ 5
- 1
nova/db/sqlalchemy/ View File

@ -4207,7 +4207,11 @@ def _archive_deleted_rows_for_table(metadata, tablename, max_rows, before):
# NOTE(jake): instance_actions_events doesn't have a instance_uuid column
# but still needs to be archived as it is a FK constraint
if ((max_rows is None or rows_archived < max_rows) and
('instance_uuid' in columns or
# NOTE(melwitt): The pci_devices table uses the 'instance_uuid'
# column to track the allocated association of a PCI device and its
# records are not tied to the lifecycles of instance records.
(tablename != 'pci_devices' and
'instance_uuid' in columns or
tablename == 'instance_actions_events')):
instances = models.BASE.metadata.tables['instances']
limit = max_rows - rows_archived if max_rows is not None else None

+ 15
- 0
nova/tests/functional/db/ View File

@ -114,6 +114,19 @@ class TestDatabaseArchive(test_servers.ServersTestBase):
# Verify we have some system_metadata since we'll check that later.
'No system_metadata for instance: %s' % server_id)
# Create a pci_devices record to simulate an instance that had a PCI
# device allocated at the time it was deleted. There is a window of
# time between deletion of the instance record and freeing of the PCI
# device in nova-compute's _complete_deletion method during RT update.
db.pci_device_update(admin_context, 1, 'fake-address',
{'compute_node_id': 1,
'address': 'fake-address',
'vendor_id': 'fake',
'product_id': 'fake',
'dev_type': 'fake',
'label': 'fake',
'status': 'allocated',
'instance_uuid': instance.uuid})
# Now try and archive the soft deleted records.
results, deleted_instance_uuids, archived = \
@ -128,6 +141,8 @@ class TestDatabaseArchive(test_servers.ServersTestBase):
self.assertIn('instance_actions', results)
self.assertIn('instance_actions_events', results)
self.assertEqual(sum(results.values()), archived)
# Verify that the pci_devices record has not been dropped
self.assertNotIn('pci_devices', results)
def _get_table_counts(self):
engine = sqlalchemy_api.get_engine()