Skip to content

Commit 7fa7cc8

Browse files
fix behaviour
1 parent 33c7ac2 commit 7fa7cc8

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

cads_broker/dispatcher.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -336,23 +336,21 @@ def manage_dismissed_request(self, request, session):
336336
session=session,
337337
)
338338
previous_status = dismission_metadata.get("previous_status", "accepted")
339+
if dismission_metadata.get("reason", "DismissedRequest") == "PermissionError":
340+
request.status = "failed"
341+
request.finished_at = datetime.datetime.now()
342+
else:
343+
request.status = "deleted"
339344
if previous_status == "running":
340345
self.qos.notify_end_of_request(
341346
request, session, scheduler=self.internal_scheduler
342347
)
343-
request.status = "deleted"
344348
elif previous_status == "accepted":
345349
self.queue.pop(request.request_uid, None)
346350
self.qos.notify_dismission_of_request(
347351
request, session, scheduler=self.internal_scheduler
348352
)
349-
if (
350-
reason := dismission_metadata.get("reason", "DismissedRequest")
351-
) == "DismissedRequest":
352-
request.status = "deleted"
353-
elif reason == "PermissionError":
354-
request.status = "failed"
355-
request.finished_at = datetime.datetime.now()
353+
logger.info("job has finished", **db.logger_kwargs(request=request))
356354
return session
357355

358356
@cachetools.cachedmethod(lambda self: self.ttl_cache)

cads_broker/entry_points.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def delete_requests(
151151
status="dismissed",
152152
request_metadata={
153153
"dismission": {
154-
"reason": "DismissedRequest",
154+
"reason": "PermissionError",
155155
"message": message,
156156
"previous_status": status,
157157
}

0 commit comments

Comments
 (0)