Skip to content

Fix celery issue #1703 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ionelmc wants to merge 2 commits into from
Closed

Fix celery issue #1703 #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e91aee
Add a debug log.
ionelmc Dec 3, 2013
be5b85c
Fix _set_terminated handling when exitcode is None.
ionelmc Dec 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion billiard/pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ def error(msg, *args, **kwargs):
if util._logger:
util._logger.error(msg, *args, **kwargs)

def critical(msg, *args, **kwargs):
if util._logger:
util._logger.critical(msg, *args, **kwargs)


def stop_if_not_current(thread, timeout=None):
if thread is not threading.currentThread():
Expand Down Expand Up @@ -1116,10 +1120,16 @@ def _join_exited_workers(self, shutdown=False):
if acked_by_gone:
self.on_job_process_down(job, acked_by_gone)
if not job.ready():
if acked_by_gone not in exitcodes:
critical("Ghost acked_by_gone %r from job %s with worker pids %s", acked_by_gone, job, job.worker_pids())

exitcode = exitcodes[acked_by_gone]
if getattr(cleaned[acked_by_gone],
'_job_terminated', False):
job._set_terminated(exitcode)
if exitcode:
job._set_terminated(exitcode)
else:
job._set_terminated()
else:
self.on_job_process_lost(
job, acked_by_gone, exitcode,
Expand Down