Changeset cd06678 for fedd

Timestamp:

Mar 18, 2010 11:39:59 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1627c3d

Parents:

bdf00d5

Message:

Handle replayed StartSegment? calls. SSL sometimes kills the response and this is needed to get the response to the controller w/o redoing the allocation

Location:

fedd/federation

Files:

• emulab_access.py (modified) (5 diffs)
• protogeni_access.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -1246 +1246 @@
         """
 
+        call_SetValue = service_caller('SetValue', log=self.log)
         for c in connInfo:
             for p in [ p for p in c.get('parameter', []) \
@@ -1257 +1258 @@
                                 (k[k.index('/')+1:], ename, proj, self.domain)
                         req = { 'name': k, 'value': value }
-                        self.call_SetValue(surl, req, cf)
+                        call_SetValue(surl, req, cf)
                     else:
                         self.log.error("Bad export request: %s" % p)
@@ -1265 +1266 @@
                     if surl and k:
                         req = { 'name': k, 'value': self.ssh_port }
-                        self.call_SetValue(surl, req, cf)
+                        call_SetValue(surl, req, cf)
                     else:
                         self.log.error("Bad export request: %s" % p)
@@ -1336 +1337 @@
         if not self.auth.check_attribute(fid, auth_attr):
             raise service_error(service_error.access, "Access denied")
+        else:
+            # See if this is a replay of an earlier succeeded StartSegment -
+            # sometimes SSL kills 'em.  If so, replay the response rather than
+            # redoing the allocation.
+            self.state_lock.acquire()
+            retval = self.allocation[aid].get('started', None)
+            self.state_lock.release()
+            if retval:
+                self.log.warning("Duplicate StartSegment for %s: " % aid + \
+                        "replaying response")
+                return retval
+
+        # A new request.  Do it.
 
         if req.has_key('segmentdescription') and \
@@ -1501 +1515 @@
             self.state_lock.acquire()
             logv = "".join(self.allocation[aid]['log'])
+            # It's possible that the StartSegment call gets retried (!). 
+            # if the 'started' key is in the allocation, we'll return it rather
+            # than redo the setup.
+            self.allocation[aid]['started'] = { 
+                    'allocID': req['allocID'],
+                    'allocationLog': logv,
+                    }
+            retval = self.allocation[aid]['started']
             self.state_lock.release()
 
-            return { 'allocID': req['allocID'], 'allocationLog': logv }
+            return retval
         elif err:
             raise service_error(service_error.federant,

fedd/federation/protogeni_access.py

@@ -905 +905 @@
         if not self.auth.check_attribute(fid, auth_attr):
             raise service_error(service_error.access, "Access denied")
+        else:
+            # See if this is a replay of an earlier succeeded StartSegment -
+            # sometimes SSL kills 'em.  If so, replay the response rather than
+            # redoing the allocation.
+            self.state_lock.acquire()
+            retval = self.allocation[aid].get('started', None)
+            self.state_lock.release()
+            if retval:
+                self.log.warning("Duplicate StartSegment for %s: " % aid + \
+                        "replaying response")
+                return retval
 
 
@@ -1069 +1080 @@
             self.state_lock.acquire()
             logv = "".join(self.allocation[aid]['log'])
+            # It's possible that the StartSegment call gets retried (!). 
+            # if the 'started' key is in the allocation, we'll return it rather
+            # than redo the setup.
+            self.allocation[aid]['started'] = { 
+                    'allocID': req['allocID'],
+                    'allocationLog': logv,
+                    }
+            retval = self.allocation[aid]['started']
             self.state_lock.release()
 
-            return { 'allocID': req['allocID'], 'allocationLog': logv }
+            return retval
         elif err:
             raise service_error(service_error.federant,