shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-11 05:17:55 +03:00
Code Issues Releases Wiki Activity

Added Calendar Actions to remove ALL cache items

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-07-18 18:03:51 +02:00
parent 692c8601bf
commit f10b370eff
2 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/uds/core/workers/servicepools_cache_updater.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2012-2020 Virtual Cable S.L.U.
# Copyright (c) 2012-2022 Virtual Cable S.L.U.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
@ -60,10 +60,6 @@ class ServiceCacheUpdater(Job):
) # Request run cache manager every configured seconds (defaults to 20 seconds).
friendly_name = 'Service Cache Updater'
@staticmethod
def calcProportion(max_, actual) -> int:
return actual * 10000 // (max_ or 1)
@staticmethod
def __notifyRestrain(servicePool) -> None:
log.doLog(
@ -127,8 +123,7 @@ class ServiceCacheUpdater(Job):
servicePool.cachedUserServices()
.filter(
userServiceManager().getCacheStateFilter(
servicePool,
services.UserDeployment.L1_CACHE
servicePool, services.UserDeployment.L1_CACHE
)
)
.exclude(Q(properties__name='destroy_after') & Q(properties__value='y'))
@ -138,8 +133,7 @@ class ServiceCacheUpdater(Job):
servicePool.cachedUserServices()
.filter(
userServiceManager().getCacheStateFilter(
servicePool,
services.UserDeployment.L2_CACHE
servicePool, services.UserDeployment.L2_CACHE
)
)
.count()
@ -237,8 +231,7 @@ class ServiceCacheUpdater(Job):
.select_for_update()
.filter(
userServiceManager().getCacheStateFilter(
servicePool,
services.UserDeployment.L2_CACHE
servicePool, services.UserDeployment.L2_CACHE
)
)
.order_by('creation_date')
@ -311,8 +304,7 @@ class ServiceCacheUpdater(Job):
servicePool.cachedUserServices()
.filter(
userServiceManager().getCacheStateFilter(
servicePool,
services.UserDeployment.L1_CACHE
servicePool, services.UserDeployment.L1_CACHE
)
)
.exclude(Q(properties__name='destroy_after') & Q(properties__value='y'))
@ -355,14 +347,13 @@ class ServiceCacheUpdater(Job):
servicePool.cachedUserServices()
.filter(
userServiceManager().getCacheStateFilter(
servicePool,
services.UserDeployment.L2_CACHE
servicePool, services.UserDeployment.L2_CACHE
)
)
.order_by('creation_date')
)
# TODO: Look first for non finished cache items and cancel them?
cache: UserService = cacheItems[0] # type: ignore # Slicing is not supported by pylance right now
cache: UserService = cacheItems[0] # type: ignore # Slicing is not supported by pylance right now
cache.removeOrCancel()
def run(self) -> None:

55
server/src/uds/models/calendar_action.py
View File

@ -43,6 +43,8 @@ from django.db import models
from uds.core.util import calendar
from uds.core.util import log
from uds.core.util import state
from uds.core import managers
from uds.core import services
from .calendar import Calendar
from .uuid_model import UUIDModel
@ -192,6 +194,18 @@ CALENDAR_ACTION_REMOVE_STUCK_USERSERVICES: typing.Dict[str, typing.Any] = {
),
}
CALENDAR_ACTION_CLEAN_CACHE_L1: typing.Dict[str, typing.Any] = {
'id': 'CLEAN_CACHE_L1',
'description': _('Clean L1 cache'),
'params': (),
}
CALENDAR_ACTION_CLEAN_CACHE_L2: typing.Dict[str, typing.Any] = {
'id': 'CLEAN_CACHE_L2',
'description': _('Clean L2 cache'),
'params': (),
}
CALENDAR_ACTION_DICT: typing.Dict[str, typing.Dict] = {
c['id']: c
@ -210,6 +224,8 @@ CALENDAR_ACTION_DICT: typing.Dict[str, typing.Dict] = {
CALENDAR_ACTION_IGNORE_UNUSED,
CALENDAR_ACTION_REMOVE_USERSERVICES,
CALENDAR_ACTION_REMOVE_STUCK_USERSERVICES,
CALENDAR_ACTION_CLEAN_CACHE_L1,
CALENDAR_ACTION_CLEAN_CACHE_L2,
)
}
@ -359,7 +375,38 @@ class CalendarAction(UUIDModel):
self.service_pool.assignedGroups.clear()
saveServicePool = False
executed = True
else: # Add/remove transport or group
elif self.action in [
CALENDAR_ACTION_CLEAN_CACHE_L1['id'],
CALENDAR_ACTION_CLEAN_CACHE_L2['id'],
]:
# 4.- Remove all cache_l1_srvs
for i in self.service_pool.cachedUserServices().filter(
managers.userServiceManager().getCacheStateFilter(
self.service_pool,
services.UserDeployment.L1_CACHE
if self.action == CALENDAR_ACTION_CLEAN_CACHE_L1['id']
else services.UserDeployment.L2_CACHE,
)
):
i.remove()
saveServicePool = False
executed = True
elif CALENDAR_ACTION_CLEAN_CACHE_L2['id'] == self.action:
# 5.- Remove all cache_l2_srvs
for i in self.service_pool.cachedUserServices().filter(
managers.userServiceManager().getCacheStateFilter(
self.service_pool, services.UserDeployment.L2_CACHE
)
):
i.remove()
saveServicePool = False
executed = True
elif self.action in [
CALENDAR_ACTION_ADD_TRANSPORT['id'],
CALENDAR_ACTION_DEL_TRANSPORT['id'],
CALENDAR_ACTION_ADD_GROUP['id'],
CALENDAR_ACTION_DEL_GROUP['id'],
]: # Add/remove transport or group
saveServicePool = False
caTransports = (
CALENDAR_ACTION_ADD_TRANSPORT['id'],
@ -394,6 +441,12 @@ class CalendarAction(UUIDModel):
self.service_pool.log(
'Scheduled action not executed because group is not available anymore'
)
else:
self.service_pool.log(
'Scheduled action not executed because is not supported: {}'.format(
self.action
)
)
if executed:
try: