Skip to content

Commit

Permalink
Merge branch '3.5.x' into 8936_custom_latex_builder
Browse files Browse the repository at this point in the history
  • Loading branch information
tk0miya authored Mar 6, 2021
2 parents f75e86d + ad10c62 commit 866e244
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Bugs fixed
----------

* #8936: LaTeX: A custom LaTeX builder fails with unknown node error
* #8952: Exceptions raised in a Directive cause parallel builds to hang

Testing
--------
Expand Down
17 changes: 15 additions & 2 deletions sphinx/util/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,21 @@ def add_task(self, task_func: Callable, arg: Any = None, result_func: Callable =
self._join_one()

def join(self) -> None:
while self._pworking:
self._join_one()
try:
while self._pworking:
self._join_one()
except Exception:
# shutdown other child processes on failure
self.terminate()
raise

def terminate(self) -> None:
for tid in list(self._precvs):
self._procs[tid].terminate()
self._result_funcs.pop(tid)
self._procs.pop(tid)
self._precvs.pop(tid)
self._pworking -= 1

def _join_one(self) -> None:
for tid, pipe in self._precvs.items():
Expand Down

0 comments on commit 866e244

Please sign in to comment.