shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-25 23:21:41 +03:00
Code Issues Releases Wiki Activity

Added tooo long machines on removing state as hanged

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-07-06 14:45:01 +02:00
parent 548b6e813d
commit de0db84a5d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/uds/core/workers/hanged_userservice_cleaner.py
View File

@ -41,6 +41,7 @@ from uds.core.util import log
logger = logging.getLogger(__name__)
MAX_REMOVAL_TIME = 48*60*60
class HangedCleaner(Job):
frecuency = 3601
@ -48,9 +49,13 @@ class HangedCleaner(Job):
friendly_name = 'Hanged services checker'
def run(self):
since_state = getSqlDatetime() - timedelta(
now = getSqlDatetime()
since_state = now - timedelta(
seconds=GlobalConfig.MAX_INITIALIZING_TIME.getInt()
)
since_removing = now -timedelta(
seconds=MAX_REMOVAL_TIME
)
# Filter for locating machine not ready
flt = Q(state_date__lt=since_state, state=State.PREPARING) | Q(
state_date__lt=since_state, state=State.USABLE, os_state=State.PREPARING
@ -69,6 +74,9 @@ class HangedCleaner(Job):
userServices__state_date__lt=since_state,
userServices__state=State.USABLE,
userServices__os_state=State.PREPARING,
) | Q(
userServices__state_date__lt=since_removing,
userServices__state=State.REMOVING,
),
)
)
@ -102,4 +110,7 @@ class HangedCleaner(Job):
us.friendly_name
),
)
us.removeOrCancel()
if us.state == State.REMOVING:
us.delete()
else:
us.removeOrCancel()