github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-17 07:49:01 +00:00
Code Issues Projects Releases Wiki Activity

perf: 处理停止任务异常情况

Browse Source
This commit is contained in:
wangruidong
2024-04-11 11:41:07 +08:00
committed by Bryan
parent bffc9f4b1d
commit 94b5d8b9e9
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/ops/api/job.py
View File

@@ -237,18 +237,21 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
{'error': _('The task is being created and cannot be interrupted. Please try again later.')}, {'error': _('The task is being created and cannot be interrupted. Please try again later.')},
status=400 status=400
) )
try:
task = AsyncResult(task_id, app=app)
inspect = app.control.inspect()
task = AsyncResult(task_id, app=app) for worker in inspect.registered().keys():
inspect = app.control.inspect() if not worker.startswith('ansible'):
continue
for worker in inspect.registered().keys(): if task_id not in [at['id'] for at in inspect.active().get(worker, [])]:
if not worker.startswith('ansible'): # 在队列中未执行使用revoke执行
continue task.revoke(terminate=True)
if task_id not in [at['id'] for at in inspect.active().get(worker, [])]: instance.set_error('Job stop by "revoke task {}"'.format(task_id))
# 在队列中未执行使用revoke执行 return Response({'task_id': task_id}, status=200)
task.revoke(terminate=True) except Exception as e:
instance.set_error('Job stop by "revoke task {}"'.format(task_id)) instance.set_error(str(e))
return Response({'task_id': task_id}, status=200) return Response({'error': f'Error while stopping the task {task_id}: {e}'}, status=400)
instance.stop() instance.stop()
return Response({'task_id': task_id}, status=200) return Response({'task_id': task_id}, status=200)