Changeset 2bb8b35

Timestamp:

Mar 4, 2012 3:49:46 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

8cab4c2

Parents:

a11eda5

Message:

Additional logging

File:

• fedd/federation/experiment_control.py (modified) (19 diffs)

fedd/federation/experiment_control.py

@@ -1652 +1652 @@
         to instantiate them and start it all up.
         """
+        self.log.info("New experiment call started for %s" % fid)
         req = req.get('NewRequestBody', None)
         if not req:
@@ -1664 +1665 @@
 
         if not access_ok:
+            self.log.info("New experiment call for %s: Access denied" % fid)
             raise service_error(service_error.access, "New access denied",
                     proof=[proof])
@@ -1713 +1715 @@
             }
 
+        self.log.info("New experiment call succeeded for %s" % fid)
         return rv
 
@@ -1976 +1979 @@
         rv = None
         state = None
+        self.log.info("vtopo call started for %s" %  fid)
 
         req = req.get('VtopoRequestBody', None)
@@ -2009 +2013 @@
         self.state_lock.release()
 
-        if rv: return rv
+        if rv: 
+            self.log.info("vtopo call completed for %s %s " % \
+                (key, fid))
+            return rv
         else: 
             if state:
+                self.log.info("vtopo call completed for %s %s (Not ready)" % \
+                    (key, fid))
                 raise service_error(service_error.partial, 
                         "Not ready: %s" % state)
             else:
+                self.log.info("vtopo call completed for %s %s (No experiment)"\
+                        % (key, fid))
                 raise service_error(service_error.req, "No such experiment")
 
@@ -2024 +2035 @@
         state = None
 
+        self.log.info("vis call started for %s" %  fid)
         req = req.get('VisRequestBody', None)
         if not req:
@@ -2061 +2073 @@
         self.state_lock.release()
 
-        if rv: return rv
+        if rv: 
+            self.log.info("vis call completed for %s %s " % \
+                (key, fid))
+            return rv
         else:
             if state:
+                self.log.info("vis call completed for %s %s (not ready)" % \
+                    (key, fid))
                 raise service_error(service_error.partial, 
                         "Not ready: %s" % state)
             else:
+                self.log.info("vis call completed for %s %s (no experiment)" % \
+                    (key, fid))
                 raise service_error(service_error.req, "No such experiment")
 
@@ -2124 +2143 @@
         """
 
+        self.log.info("Create experiment call started for %s" % fid)
         req = req.get('CreateRequestBody', None)
         if req:
@@ -2228 +2248 @@
             # exceptions.  Failing at this point returns a fault to the remote
             # caller. 
+
+            self.log.info("Create experiment call failed for %s %s: %s" % 
+                    (eid, fid, e))
             self.clear_placeholder(eid, expid, tmpdir)
             raise e
@@ -2260 +2283 @@
                 'proof': [ proof.to_dict() ] + proofs,
             }
+        self.log.info("Create experiment call succeeded for %s %s" % \
+                (eid, fid))
 
         return rv
@@ -2353 +2378 @@
         rv = None
 
+        self.log.info("Info call started for %s" %  fid)
         req = req.get('InfoRequestBody', None)
         if not req:
@@ -2384 +2410 @@
                 if top is not None: top = top.clone()
         self.state_lock.release()
+        self.log.info("Gathered Info for %s %s" % (key, fid))
 
         # If the legacy visualization and topology representations are
         # requested, calculate them and add them to the return.
         if legacy and rv is not None:
+            self.log.info("Generating legacy Info for %s %s" % (key, fid))
             if top is not None:
                 vtopo = topdl.topology_to_vtopo(top)
@@ -2401 +2429 @@
                         rv['vis'] = vis
         if rv:
+            self.log.info("Info succeded for %s %s" % (key, fid))
             rv['proof'] = proof.to_dict()
             return rv
-        else:
+        else: 
+            self.log.info("Info failed for %s %s: no experiment" % (key, fid))
             raise service_error(service_error.req, "No such experiment")
 
@@ -2541 +2571 @@
         rv = { 'info': [ ], 'proof': [ ] }
 
+        self.log.info("Multi Info call started for %s" %  fid)
         self.state_lock.acquire()
         for key in [ k for k in self.state.keys() if isinstance(k, fedid)]:
@@ -2549 +2580 @@
                     continue
                 else:
+                    self.log.info("Multi Info call failed for %s: %s" %  \
+                            (e,fid))
                     self.state_lock.release()
                     raise e
@@ -2558 +2591 @@
                 rv['proof'].append(proof.to_dict())
         self.state_lock.release()
+        self.log.info("Multi Info call succeeded for %s" %  fid)
         return rv
 
@@ -2678 +2712 @@
         information
         """
+        self.log.info("Terminate experiment call started for %s" % fid)
         tbparams = { }
         req = req.get('TerminateRequestBody', None)
@@ -2740 +2775 @@
                 self.remove_dirs("%s/%s" % (self.repodir, repo))
         
+            self.log.info("Terminate experiment succeeded for %s %s" % \
+                    (key, fid))
             return { 
                     'experiment': exp , 
@@ -2746 +2783 @@
                     }
         else:
+            self.log.info("Terminate experiment failed for %s %s: no state" % \
+                    (key, fid))
             raise service_error(service_error.req, "No saved state")