shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-21 18:03:54 +03:00
Code Issues Releases Wiki Activity

Small deferred_removal improvement and fix test to ensure services are cached correctly

Browse Source
This commit is contained in:
Adolfo Gómez García 2024-06-23 16:23:54 +02:00
parent a538827155
commit dec744a0e2
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
server/src/tests/core/services/generics/test_dynamic_deferred_removal.py
View File

@ -132,22 +132,25 @@ class DynamicServiceTest(UDSTransactionTestCase):
for count, service in enumerate(services):
instance = typing.cast(fixtures.DynamicTestingServiceForDeferredDeletion, service.get_instance())
self.assertIsInstance(instance, fixtures.DynamicTestingServiceForDeferredDeletion)
instance.delete(mock.MagicMock(), f'vmid_{count}')
instance.mock.execute_delete.assert_called_with(f'vmid_{count}')
instance.delete(mock.MagicMock(), f'vmid_{count}_1')
instance.mock.execute_delete.assert_called_with(f'vmid_{count}_1')
# Add a second delete, so can check service caching later
instance.delete(mock.MagicMock(), f'vmid_{count}_2')
instance.mock.execute_delete.assert_called_with(f'vmid_{count}_2')
self.assertEqual(fixtures.DynamicTestingServiceForDeferredDeletion.mock.execute_delete.call_count, 8)
self.assertEqual(fixtures.DynamicTestingServiceForDeferredDeletion.mock.execute_delete.call_count, 16)
self.assertEqual(fixtures.DynamicTestingServiceForDeferredDeletion.mock.is_deleted.call_count, 0)
# Reset mock
fixtures.DynamicTestingServiceForDeferredDeletion.mock.reset_mock()
# No entries to_delete
# No entries into to_delete
self.assertEqual(self.count_entries_on_storage(deferred_deletion.TO_DELETE_GROUP), 0)
# Storage db should have 8 entries
# Storage db should have 16 entries
with deferred_deletion.DeferredDeletionWorker.deferred_storage.as_dict(
deferred_deletion.DELETING_GROUP
) as deleting:
self.assertEqual(len(deleting), 8)
self.assertEqual(len(deleting), 16)
for key, info in typing.cast(dict[str, deferred_deletion.DeferredDeletionInfo], deleting).items():
now = sql_now()
self.assertIsInstance(info, deferred_deletion.DeferredDeletionInfo)
@ -174,20 +177,20 @@ class DynamicServiceTest(UDSTransactionTestCase):
self.set_last_check_expired()
# Now, get from deleting again, should have all services and infos
# OVerride MAX_DELETIONS_AT_ONCE to get only 4 entries
deferred_deletion.MAX_DELETIONS_AT_ONCE = 4
# OVerride MAX_DELETIONS_AT_ONCE to get only 1 entries
deferred_deletion.MAX_DELETIONS_AT_ONCE = 1
services_1, key_info_1 = job._get_from_storage(deferred_deletion.DELETING_GROUP)
self.assertEqual(len(services_1), 4)
self.assertEqual(len(key_info_1), 4)
# And should rest only 4 on storage
self.assertEqual(len(services_1), 1)
self.assertEqual(len(key_info_1), 1)
# And should rest only 15 on storage
with deferred_deletion.DeferredDeletionWorker.deferred_storage.as_dict(
deferred_deletion.DELETING_GROUP
) as deleting:
self.assertEqual(len(deleting), 4)
# again, should return 4 entries
self.assertEqual(len(deleting), 15)
deferred_deletion.MAX_DELETIONS_AT_ONCE = 16
services_2, key_info_2 = job._get_from_storage(deferred_deletion.DELETING_GROUP)
self.assertEqual(len(services_2), 4)
self.assertEqual(len(key_info_2), 4)
self.assertEqual(len(services_2), 8) # 8 services must be returned
self.assertEqual(len(key_info_2), 15) # And 15 entries
# Re-store all DELETING_GROUP entries
with deferred_deletion.DeferredDeletionWorker.deferred_storage.as_dict(
@ -196,19 +199,17 @@ class DynamicServiceTest(UDSTransactionTestCase):
for info in itertools.chain(key_info_1, key_info_2):
deleting[info[0]] = info[1]
# set MAX_DELETIONS_AT_ONCE to a value bigger than 8
deferred_deletion.MAX_DELETIONS_AT_ONCE = 9
# set MAX_DELETIONS_AT_ONCE to a value bigger than 16
deferred_deletion.MAX_DELETIONS_AT_ONCE = 100
# Now, process all entries normally
job.run()
# Should have called is_deleted 8 times
self.assertEqual(fixtures.DynamicTestingServiceForDeferredDeletion.mock.is_deleted.call_count, 8)
# Should have called is_deleted 16 times
self.assertEqual(fixtures.DynamicTestingServiceForDeferredDeletion.mock.is_deleted.call_count, 16)
# And should have removed all entries from deleting, because is_deleted returns True
with deferred_deletion.DeferredDeletionWorker.deferred_storage.as_dict(
deferred_deletion.DELETING_GROUP
) as deleting:
self.assertEqual(len(deleting), 0)
self.assertEqual(self.count_entries_on_storage(deferred_deletion.DELETING_GROUP), 0)
self.assertEqual(self.count_entries_on_storage(deferred_deletion.TO_DELETE_GROUP), 0)
def test_deferred_delete_delayed_full(self) -> None:
service = fixtures.create_dynamic_service_for_deferred_deletion()

10
server/src/uds/core/workers/deferred_deletion.py
View File

@ -129,13 +129,11 @@ class DeferredDeletionWorker(Job):
typing.cast(collections.abc.Iterable[tuple[str, DeferredDeletionInfo]], storage_dict.items()),
key=lambda x: x[1].last_check,
):
service: typing.Optional['DynamicService'] = None
if info.last_check + datetime.timedelta(seconds=CHECK_INTERVAL) > sql_now():
continue
try:
if info.service_uuid not in services:
service = typing.cast(
services[info.service_uuid] = typing.cast(
'DynamicService', Service.objects.get(uuid=info.service_uuid).get_instance()
)
except Exception as e:
@ -143,13 +141,9 @@ class DeferredDeletionWorker(Job):
del storage_dict[key]
continue
count += 1
if count > MAX_DELETIONS_AT_ONCE:
if (count := count + 1) > MAX_DELETIONS_AT_ONCE:
break
if service is not None:
services[info.service_uuid] = service
infos.append((key, info))
del storage_dict[key] # Remove from storage, being processed
return services, infos