Changeset ab33158 for fedd

Timestamp:

Oct 7, 2009 9:18:17 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

af51a97

Parents:

181cf9c

Message:

final tweaks to get working

File:

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

fedd/federation/dragon_access.py

@@ -561 +561 @@
             start = time.time()
         if not end:
-            end = start + 5 *60
+            end = start + 120 *60
 
 
@@ -598 +598 @@
                 'query', '-repo',  repo , '-url', self.idc_url, '-gri', gri]
 
-            while status in ('ACCEPTED', 'INSETUP', 'PENDING'):
-                time.sleep(5)
+            while status in ('ACCEPTED', 'INSETUP', 'INCREATE', 'PENDING'):
                 log.debug("[start_segment]: %s" % " ".join(cmd))
                 if not self.create_debug:
@@ -663 +662 @@
                     status = 'ACTIVE'
                     vlan_no = int(v) or 1
+                if status in ('ACCEPTED', 'INSETUP', 'INCREATE', 'PENDING'):
+                    time.sleep(45)
             if status in ('ACTIVE', 'FINISHED', 'CANCELLED'):
                 break
@@ -774 +775 @@
         auth_attr = req['allocID']['fedid']
         aid = "%s" % auth_attr
+
+        self.log.debug("Terminate request for %s" %aid)
         attrs = req.get('fedAttr', [])
         if not self.auth.check_attribute(fid, auth_attr):
@@ -786 +789 @@
             user = None
         self.state_lock.release()
+        self.log.debug("Stop segment for user: %s gre %s" %(user, gri))
 
         if not gri:
@@ -794 +798 @@
             raise service_error(service_error.internal, 
                     "Can't find creation user for %s" % aid)
-
+    
+        self.log.debug("Stop segment for GRI: %s" %gri)
         self.stop_segment(user, gri)
         return { 'allocID': req['allocID'] }