Changeset 815cd26

Timestamp:

May 25, 2012 10:24:56 AM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

17c2f7b

Parents:

5ae9d94

Message:

Add timeout and extra debug logging.

Location:

fedd/federation

Files:

• emulab_access.py (modified) (2 diffs)
• util.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -656 +656 @@
             self.log.debug("Retrieving %s" % s)
             try:
-                get_url(s, certfile, softdir)
+                get_url(s, certfile, softdir, log=self.log)
             except:
                 t, v, st = sys.exc_info()
@@ -700 +700 @@
                     self.log.debug("Retrieving %s from %s" % \
                             (a['attribute'], a['value']))
-                    get_url(a['value'], certfile, tmpdir)
+                    get_url(a['value'], certfile, tmpdir, log=self.log)
                 except:
                     t, v, st = sys.exc_info()

fedd/federation/util.py

@@ -204 +204 @@
     d.close()
 
-def get_url(url, cf, destdir, fn=None, max_retries=5):
+def get_url(url, cf, destdir, fn=None, max_retries=5, log=None):
     """
     Get data from a federated data store.  This presents the client cert/fedid
@@ -217 +217 @@
     while not ok and retries < 5:
         try:
+            if log:
+                log.debug('Creating HTTPSConnection')
             conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
-                    cert_file=cf, key_file=cf)
+                    cert_file=cf, key_file=cf, timeout=30)
             conn.putrequest('GET', po.path)
             conn.endheaders()
+            if log:
+                log.debug('Connecting')
             response = conn.getresponse()
+            if log:
+                log.debug('Connected')
 
             lf = open("%s/%s" % (destdir, fn), "w")
+            if log:
+                log.debug('initial read')
             buf = response.read(4096)
             while buf:
                 lf.write(buf)
+                if log:
+                    log.debug('loop read')
                 buf = response.read(4096)
             lf.close()