Attachment 704222 Details for Bug 916562 – Select based low-level polling

[patch] Select based low-level polling

createrepo-deadlock.patch (text/plain), 3.36 KB, created by Anders Blomdell on 2013-03-01 15:25:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anders Blomdell

Created: 2013-03-01 15:25:01 UTC

Size: 3.36 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-03-01 16:19:40.874521234 +0100
>@@ -26,6 +26,7 @@
> import stat
> import fcntl
> import subprocess
>+import select
> 
> from yum import misc, Errors
> from yum.repoMDObject import RepoMD, RepoData
>@@ -650,6 +651,7 @@
>             
>                 
> 
>+            fds = {}
>             for (num, cmdline) in worker_cmd_dict.items():
>                 if not self.conf.quiet:
>                     self.callback.log("Spawning worker %s with %s pkgs" % (num, 
>@@ -657,22 +659,27 @@
>                 job = subprocess.Popen(cmdline, stdout=subprocess.PIPE,
>                                         stderr=subprocess.PIPE)
>                 worker_jobs[num] = job
>+                fds[job.stdout] = [ num, job.stdout, self.callback.log, '' ]
>+                fds[job.stderr] = [ num, job.stderr, self.callback.errorlog, '' ]
>             
>-            gimmebreak = 0
>-            while gimmebreak != len(worker_jobs.keys()):
>-                gimmebreak = 0
>-                for (num,job) in worker_jobs.items():
>-                    if job.poll() is not None:
>-                        gimmebreak+=1
>-                    line = job.stdout.readline()
>-                    if line:
>-                        self.callback.log('Worker %s: %s' % (num, line.rstrip()))
>-                    line = job.stderr.readline()
>-                    if line:
>-                        self.callback.errorlog('Worker %s: %s' % (num, line.rstrip()))
>-                    
>+            while fds:
>+                for fd in select.select(fds, [], [])[0]:
>+                    num, stream, logger, buf = fds[fd]
>+                    data = os.read(fd.fileno(), 4096)
>+                    if data == '':
>+                        # End of file 
>+                        if len(buf) > 0:
>+                            logger('Worker %s: %s' % (num, buf.rstrip()))
>+                        del fds[fd]
>+                        continue
>+                    buf =  buf + data
>+                    while '\n' in buf:
>+                        line,buf = buf.split('\n', 1)
>+                        logger('Worker %s: %s' % (num, line.rstrip()))
>+                    fds[fd][3] = buf
>+
>             for (num, job) in worker_jobs.items():
>-                if job.returncode != 0:
>+                if job.wait() != 0:
>                     msg = "Worker exited with non-zero value: %s. Fatal." % job.returncode
>                     self.callback.errorlog(msg)
>                     raise MDError, msg
>--- /usr/share/createrepo/genpkgmetadata.py~	2012-02-16 21:43:32.000000000 +0100
>+++ /usr/share/createrepo/genpkgmetadata.py	2013-02-28 14:54:51.501227844 +0100
>@@ -225,6 +225,7 @@
>     def log(self, thing):
>         """log output"""
>         print thing
>+        sys.stdout.flush()
> 
>     def progress(self, item, current, total):
>         """progress bar"""
>--- /usr/share/createrepo/worker.py~	2012-02-16 21:43:32.000000000 +0100
>+++ /usr/share/createrepo/worker.py	2013-02-28 15:09:05.402388492 +0100
>@@ -87,6 +87,7 @@
>         try:
>             if not opts.quiet and opts.verbose:
>                 print "reading %s" % (pkgfile)
>+                sys.stdout.flush()
> 
>             pkg = createrepo.yumbased.CreateRepoPackage(ts, package=pkgpath, 
>                                 sumtype=globalopts.get('sumtype', None),

Actions: View | Diff

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