Changeset d8442da

Timestamp:

Apr 23, 2010 5:35:28 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

2ee4226

Parents:

9a8cd92

Message:

This seems more robust in calling GetValue?. This was intermittently hanging, I think because of troubles with the SSL state in the caller object. Reinitializing it seems to help.

Location:

fedd/federation

Files:

• emulab_access.py (modified) (8 diffs)
• experiment_control.py (modified) (1 diff)

fedd/federation/emulab_access.py

@@ -707 +707 @@
                             "Cannot export %s" % ep)
 
+            # XXX
             # Check for access to restricted nodes
             if req.has_key('resources') and req['resources'].has_key('node'):
@@ -721 +722 @@
                             "Access denied (nodetypes %s)" % \
                             str(', ').join(inaccessible))
+            # XXX
 
             # These were passed around before, but now are hidden from users
@@ -1317 +1319 @@
                                 (k[k.index('/')+1:], ename, proj, self.domain)
                         req = { 'name': k, 'value': value }
+                        self.log.debug("Setting %s to %s on %s" % \
+                                (k, value, surl))
                         call_SetValue(surl, req, cf)
                     else:
@@ -1325 +1329 @@
                     if surl and k:
                         req = { 'name': k, 'value': self.ssh_port }
+                        self.log.debug("Setting %s to %s on %s" % \
+                                (k, self.ssh_port, surl))
                         call_SetValue(surl, req, cf)
                     else:
@@ -1348 +1354 @@
                 if name and key and store :
                     req = { 'name': key, 'wait': True }
-                    r = self.call_GetValue(store, req, cf)
+                    self.log.debug("Waiting for %s (%s) from %s" % \
+                            (name, key, store))
+                    call_GetValue = service_caller('GetValue')
+                    r = call_GetValue(store, req, cf)
                     r = r.get('GetValueResponseBody', None)
                     if r :
@@ -1355 +1364 @@
                             if v is not None:
                                 if name == 'peer':
+                                    self.log.debug("Got peer %s" % v)
                                     c['peer'] = v
                                 else:
+                                    self.log.debug("Got %s %s" % (name, v))
                                     if c.has_key('fedAttr'):
                                         c['fedAttr'].append({
@@ -1452 +1463 @@
                 if a['attribute'] in configs:
                     try:
+                        self.log.debug("Retrieving %s from %s" % \
+                                (a['attribute'], a['value']))
                         get_url(a['value'], certfile, tmpdir)
                     except:
@@ -1488 +1501 @@
                             print >>tf, cert
                             tf.close()
+                            self.log.debug("Getting userconf info: %s" % u)
                             get_url(u, tn, tmpdir, "userconf")
+                            self.log.debug("Got userconf info: %s" % u)
                         except IOError, e:
                             raise service_error(service.error.internal, 

fedd/federation/experiment_control.py

@@ -2274 +2274 @@
 
         if self.auth.check_attribute(fid, name):
+            self.log.debug("[GetValue] asking for %s " % name)
             try:
                 v = self.synch_store.get_value(name, wait)