Changeset 1627c3d for fedd

Timestamp:

Mar 18, 2010 11:44:26 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

f8ae7aa

Parents:

cd06678

Message:

Protect dragon from StartSegment? replays. Also writeout the replay protection in the other access controllers.

Location:

fedd/federation

Files:

• dragon_access.py (modified) (2 diffs)
• emulab_access.py (modified) (1 diff)
• protogeni_access.py (modified) (1 diff)

fedd/federation/dragon_access.py

@@ -800 +800 @@
             raise service_error(service_error.access, "Access denied")
         else:
-            certfile = "%s/%s.pem" % (self.certdir, aid)
+            # 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
+
+        certfile = "%s/%s.pem" % (self.certdir, aid)
 
         if req.has_key('segmentdescription') and \
@@ -853 +864 @@
             self.state[aid]['gri'] = gri
             logv = "".join(self.state[aid]['log'])
-            self.write_state()
-            self.state_lock.release()
-
-            return { 
+            # 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.write_state()
+            self.state_lock.release()
+
+            return retval
         elif err:
             raise service_error(service_error.federant,

fedd/federation/emulab_access.py

@@ -1523 +1523 @@
                     }
             retval = self.allocation[aid]['started']
+            self.write_state()
             self.state_lock.release()
 

fedd/federation/protogeni_access.py

@@ -1088 +1088 @@
                     }
             retval = self.allocation[aid]['started']
+            self.write_state()
             self.state_lock.release()