Changeset 1dcaff4 for fedd/federation/protogeni_access.py

Timestamp:

Mar 18, 2010 8:35:10 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

114d24b

Parents:

3159f5d

Message:

Improved SSL error handling (more try blocks, BIOError exception)
Separate get_url into util
Work with remote splitter.

File:

• fedd/federation/protogeni_access.py (modified) (6 diffs)

fedd/federation/protogeni_access.py

@@ -253 +253 @@
                     (lineno, config))
         f.close()
-
-# need this ?
-    def get_users(self, obj):
-        """
-        Return a list of the IDs of the users in dict
-        """
-        if obj.has_key('user'):
-            return [ unpack_id(u['userID']) \
-                    for u in obj['user'] if u.has_key('userID') ]
-        else:
-            return None
-# need this ?
 
     def write_state(self):
@@ -899 +887 @@
 
     def StartSegment(self, req, fid):
-        def get_url(url, cf, destdir, fn=None):
-            po = urlparse(url)
-            if not fn:
-                fn = po.path.rpartition('/')[2]
-            retries = 0
-            ok = False
-            while not ok and retries < 5:
-                try:
-                    conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
-                            cert_file=cf, key_file=cf)
-                    conn.putrequest('GET', po.path)
-                    conn.endheaders()
-                    response = conn.getresponse()
-
-                    lf = open("%s/%s" % (destdir, fn), "w")
-                    buf = response.read(4096)
-                    while buf:
-                        lf.write(buf)
-                        buf = response.read(4096)
-                    lf.close()
-                    ok = True
-                except IOError, e:
-                    print e
-                    raise service_error(service_error.internal,
-                            "Error writing tempfile: %s" %e)
-                except httplib.HTTPException, e:
-                    print e
-                    raise service_error(service_error.internal, 
-                            "Error retrieving data: %s" % e)
-                except SSLError, e:
-                    print "SSL error %s" %e
-                    retries += 1
-
-            if retries > 5:
-                raise service_error(service_error.internal,
-                        "Repeated SSL failures")
-
 
         configs = set(('hosts', 'ssh_pubkey', 'ssh_secretkey'))
@@ -979 +930 @@
                 for s in getattr(e, 'software', []):
                     sw.add(s.location)
-            if len(sw) > 0:
-                os.mkdir(softdir)
+            os.mkdir(softdir)
             for s in sw:
                 self.log.debug("Retrieving %s" % s)
-                get_url(s, certfile, softdir)
+                try:
+                    get_url(s, certfile, softdir)
+                except:
+                    t, v, st = sys.exc_info()
+                    raise service_error(service_error.internal,
+                            "Error retrieving %s: %s" % (s, v))
 
             # Copy local portal node software to the tempdir
@@ -1000 +955 @@
             for a in attrs:
                 if a['attribute'] in configs:
-                    get_url(a['value'], certfile, tmpdir)
+                    try:
+                        self.log.debug("Retrieving %s" % a['value'])
+                        get_url(a['value'], certfile, tmpdir)
+                    except:
+                        t, v, st = sys.exc_info()
+                        raise service_error(service_error.internal,
+                                "Error retrieving %s: %s" % (s, v))
                 if a['attribute'] == 'ssh_pubkey':
                     pubkey_base = a['value'].rpartition('/')[2]
@@ -1037 +998 @@
                                     "Cannot create temp file for " + 
                                     "userconfig certificates: %s e")
+                        except:
+                            t, v, st = sys.exc_info()
+                            raise service_error(service_error.internal,
+                                    "Error retrieving %s: %s" % (u, v))
                         finally:
                             if tn: os.remove(tn)
@@ -1043 +1008 @@
                                 "No certificate for retreiving userconfig")
                     break
-
-
 
             self.state_lock.acquire()