Attachment 703876 Details for Bug 916562 – Nonblocking read of worker output

[patch] Nonblocking read of worker output

createrepo-deadlock.patch (text/plain), 2.15 KB, created by Anders Blomdell on 2013-02-28 10:31:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anders Blomdell

Created: 2013-02-28 10:31:07 UTC

Size: 2.15 KB

patch

obsolete

>--- /usr/lib/python2.7/site-packages/createrepo/__init__.py~	2012-02-16 21:43:32.000000000 +0100
>+++ /usr/lib/python2.7/site-packages/createrepo/__init__.py	2013-02-28 11:12:33.302760961 +0100
>@@ -26,6 +26,8 @@
> import stat
> import fcntl
> import subprocess
>+import select
>+import errno
> 
> from yum import misc, Errors
> from yum.repoMDObject import RepoMD, RepoData
>@@ -657,18 +659,37 @@
>                 job = subprocess.Popen(cmdline, stdout=subprocess.PIPE,
>                                         stderr=subprocess.PIPE)
>                 worker_jobs[num] = job
>-            
>+                def make_nonblocking(f):
>+                    fl = fcntl.fcntl(f.fileno(), fcntl.F_GETFL)
>+                    fcntl.fcntl(f.fileno(), fcntl.F_SETFL, fl | os.O_NONBLOCK)
>+                make_nonblocking(job.stdout)
>+                make_nonblocking(job.stderr)
>+
>+            def readline_from_nonblocking(f):
>+                try:
>+                    return f.readline()
>+                except IOError, e:
>+                    if e.errno != errno.EAGAIN:
>+                        raise
>+                    return None
>+
>+            fds = reduce(lambda r,j: r + [j.stdout, j.stderr],
>+                         worker_jobs.values(),
>+                         [])
>             gimmebreak = 0
>             while gimmebreak != len(worker_jobs.keys()):
>+                select.select(fds,[],[],1)
>                 gimmebreak = 0
>                 for (num,job) in worker_jobs.items():
>                     if job.poll() is not None:
>                         gimmebreak+=1
>-                    line = job.stdout.readline()
>+                    line = readline_from_nonblocking(job.stdout)
>                     if line:
>+                        gimmebreak = 0
>                         self.callback.log('Worker %s: %s' % (num, line.rstrip()))
>-                    line = job.stderr.readline()
>+                    line = readline_from_nonblocking(job.stderr)
>                     if line:
>+                        gimmebreak = 0             
>                         self.callback.errorlog('Worker %s: %s' % (num, line.rstrip()))
>                     
>             for (num, job) in worker_jobs.items():

Actions: View | Diff

Attachments on bug 916562: 703876 | 703907 | 703910 | 703925 | 704161 | 704222