[Buildroot] [git commit branch/2021.05.x] package/python3: add patch to fix highly parallel builds
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-08-08 09:57:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=78a6a0907cf83b6a33a18d42569fc1f573baa947 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.05.x Highly parallel host-python3 builds sometimes fail with: Exception in thread Thread-1: Traceback (most recent call last): File "/tmp/instance-3/output-1/host/lib/python3.9/threading.py", line 973, in _bootstrap_inner self.run() File "/tmp/instance-3/output-1/host/lib/python3.9/concurrent/futures/process.py", line 317, in run result_item, is_broken, cause = self.wait_result_broken_or_wakeup() File "/tmp/instance-3/output-1/host/lib/python3.9/concurrent/futures/process.py", line 376, in wait_result_broken_or_wakeup worker_sentinels = [p.sentinel for p in self.processes.values()] File "/tmp/instance-3/output-1/host/lib/python3.9/concurrent/futures/process.py", line 376, in <listcomp> worker_sentinels = [p.sentinel for p in self.processes.values()] RuntimeError: dictionary changed size during iteration During the compile_all.py step of host-python3. This issue is reported upstream at https://bugs.python.org/issue43498, and while not yet fixed upstream, a PR was proposed with a possible fix for it. Seems the PR seems reasonable, let's give it a chance and see if it improves the situation. Hopefully Fixes: http://autobuild.buildroot.net/results/ae6c4ab292589a4e4442dfb0a1286349a9bf4d29/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Yann E. MORIN <redacted> (cherry picked from commit e17946b409c84afd15c7de47df2c8ad4dd648fae) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- ...ary-iteration-error-in-_ExecutorManagerTh.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+)
diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch
new file mode 100644
index 0000000000..fbe44c7753
--- /dev/null
+++ b/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch@@ -0,0 +1,29 @@ +From 331966be70c371b268a4fcce9e97280cd869f137 Mon Sep 17 00:00:00 2001 +From: Jakub Kulik <kulikjak@gmail.com> +Date: Mon, 15 Mar 2021 08:49:28 +0100 +Subject: [PATCH] Fix dictionary iteration error in _ExecutorManagerThread + +[Thomas: Taken from upstream pull request +https://github.com/python/cpython/pull/24868, which is aimed at fixing +https://bugs.python.org/issue43498] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +--- + Lib/concurrent/futures/process.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py +index 90bc98bf2ec..e3b36dff572 100644 +--- a/Lib/concurrent/futures/process.py ++++ b/Lib/concurrent/futures/process.py +@@ -373,7 +373,7 @@ class _ExecutorManagerThread(threading.Thread): + assert not self.thread_wakeup._closed + wakeup_reader = self.thread_wakeup._reader + readers = [result_reader, wakeup_reader] +- worker_sentinels = [p.sentinel for p in self.processes.values()] ++ worker_sentinels = [p.sentinel for p in self.processes.copy().values()] + ready = mp.connection.wait(readers + worker_sentinels) + + cause = None +-- +2.31.1 +
_______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot