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

Fixed detecting canceling hanged

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-08-29 15:20:43 +02:00
parent 09c5cc2f43
commit 3bdf4c18ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class HangedCleaner(Job):
# 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
)
) | Q(state_date__lt=since_removing, state__in=[State.REMOVING, State.CANCELING])
withHangedServices = (
ServicePool.objects.annotate(
@ -74,7 +74,7 @@ class HangedCleaner(Job):
)
| Q(
userServices__state_date__lt=since_removing,
userServices__state=State.REMOVING,
userServices__state__in=[State.REMOVING, State.CANCELING],
),
)
)
@ -96,7 +96,7 @@ class HangedCleaner(Job):
continue
logger.debug('Found hanged service %s', us)
if (
us.state == State.REMOVING
us.state in [State.REMOVING, State.CANCELING]
): # Removing too long, remark it as removable
log.doLog(
us,