mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-04 23:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: runqueue: Revert child signal handler for now

Browse Source 
We're running into processes using 100% cpu. It appears theses are locked in
a subprocess.poll() type loop where the process has exited but the code is
looping as its not handling the ECHILD error.

http://bugs.python.org/issue14396
http://bugs.python.org/issue15756

This is likely due to one or both of the above bugs. The question is what actually
grabbed the child exit code as it wasn't this code. Its likely there is therefore
some other code racing and taking that code, it may be some kind of race like:

http://hg.python.org/cpython/rev/767420808a62/

where the fix effectively catches the childs codes in a different part of the system.

We could try and get everyone onto python 2.7.4 where the above bugs are fixed however
for now its safer to admit defeat and go back to polling explictly for our worker exit
codes.

(Bitbake rev: 5b9a099ec2a1dc954b614e12a306595f55b6a99e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2014-03-19 12:53:05 +00:00
parent ea52b5e21b
commit ac4ff568f5
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bitbake/lib/bb/runqueue.py
View File

@@ -856,7 +856,6 @@ class RunQueue:
self.workerpipe = None
self.fakeworker = None
self.fakeworkerpipe = None
self.oldsigchld = None
def _start_worker(self, fakeroot = False, rqexec = None):
logger.debug(1, "Starting bitbake-worker")
@@ -913,34 +912,10 @@ class RunQueue:
continue
workerpipe.close()
def sigchild_exception(self, *args, **kwargs):
for w in [self.worker, self.fakeworker]:
if not w:
continue
try:
pid, status = os.waitpid(w.pid, os.WNOHANG)
if pid != 0 and not self.teardown:
name = None
if self.worker and pid == self.worker.pid:
name = "Worker"
elif self.fakeworker and pid == self.fakeworker.pid:
name = "Fakeroot"
else:
bb.warn("Unknown process (%s) exited unexpectedly (%s), shutting down..." % (pid, str(status)))
if name and not self.teardown:
bb.error("%s process (%s) exited unexpectedly (%s), shutting down..." % (name, pid, str(status)))
self.finish_runqueue(True)
except OSError:
return
def start_worker(self):
if self.worker:
self.teardown_workers()
self.teardown = False
if self.oldsigchld is None:
self.oldsigchld = signal.signal(signal.SIGCHLD, self.sigchild_exception)
if self.oldsigchld is None:
self.oldsigchld = signal.SIG_DFL
self.worker, self.workerpipe = self._start_worker()
def start_fakeworker(self, rqexec):
@@ -949,9 +924,6 @@ class RunQueue:
def teardown_workers(self):
self.teardown = True
if self.oldsigchld is not None:
signal.signal(signal.SIGCHLD, self.oldsigchld)
self.oldsigchld = None
self._teardown_worker(self.worker, self.workerpipe)
self.worker = None
self.workerpipe = None
@@ -2118,6 +2090,23 @@ class runQueuePipe():
self.rqexec = rqexec
def read(self):
try:
for w in [self.rq.worker, self.rq.fakeworker]:
if not w:
continue
pid, status = os.waitpid(w.pid, os.WNOHANG)
if pid != 0 and not self.rq.teardown:
if self.rq.worker and pid == self.rq.worker.pid:
name = "Worker"
elif self.rq.fakeworker and pid == self.rq.fakeworker.pid:
name = "Fakeroot"
else:
name = "Unknown"
bb.error("%s process (%s) exited unexpectedly (%s), shutting down..." % (name, pid, str(status)))
self.rq.finish_runqueue(True)
except OSError:
pass
start = len(self.queue)
try:
self.queue = self.queue + self.input.read(102400)