[yum-commits] 2 commits - urlgrabber/grabber.py

[zpavlas at osuosl.org]

 urlgrabber/grabber.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit caa91e1dd49b2e4a3b049d1754b33278e5c4c35c
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Sep 2 16:14:22 2013 +0200

    host max_connections: use the default limit consistently, not just for MGs

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 0b51af0..63baef7 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -2311,7 +2311,7 @@ def parallel_wait(meter=None):
 
                 # update the current mirror and limit
                 key = best['mirror']
-                limit = best.get('kwargs', {}).get('max_connections') or 2
+                limit = best.get('kwargs', {}).get('max_connections')
                 opts.async = key, limit
 
                 # update URL and proxy
@@ -2324,7 +2324,7 @@ def parallel_wait(meter=None):
             key, limit = opts.async
             if key in single:
                 limit = 1
-            while host_con.get(key, 0) >= limit:
+            while host_con.get(key, 0) >= (limit or 2):
                 perform()
             if DEBUG:
                 DEBUG.info('max_connections(%s): %d/%d', key, host_con.get(key, 0), limit)
commit ddbbf7069a1cf0240fbf36a0c93e15f47a5850de
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Sep 2 16:00:19 2013 +0200

    Switch to max_connections=1 after refused connect. BZ 853432

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 30a8bdb..0b51af0 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -2216,9 +2216,11 @@ def parallel_wait(meter=None):
 
             if ug_err is None:
                 continue
-            if ug_err.errno == pycurl.E_OPERATION_TIMEOUTED:
+            if limit > 1 and ug_err.errno in (pycurl.E_OPERATION_TIMEOUTED,
+                                              pycurl.E_COULDNT_CONNECT):
                 # One possible cause is connection-limited server.
                 # Turn on the max_connections=1 override. BZ 853432
+                DEBUG.info('max_connections(%s) %d => 1', key, limit)
                 single.add(key)
 
             retry = opts.retry or 0