Changeset 2f14616

Timestamp:

Aug 3, 2009 2:03:01 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

version-1.30

Children:

3cbf9eb

Parents:

59f3d1f

Message:

Multi info was all screwed up if the requester wasn't authorized to see any one
of the experiments. This gracefully handles the exceptions that
check_experiment_access throws as well as making some threading.Locks
threading.RLocks to head off the coming deadlocks.

File:

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

fedd/federation/experiment_control.py

@@ -53 +53 @@
             """
             self.ll = l
-            self.lock = Lock()
+            self.lock = RLock()
         def write(self, str):
             """
@@ -262 +262 @@
 
         self.state = { }
-        self.state_lock = Lock()
+        self.state_lock = RLock()
         self.tclsh = "/usr/local/bin/otclsh"
         self.tcl_splitter = config.get("splitter", "tcl_splitter") or \
@@ -2303 +2303 @@
         self.state_lock.acquire()
         for key in [ k for k in self.state.keys() if isinstance(k, fedid)]:
-            self.check_experiment_access(fid, key)
+            try:
+                self.check_experiment_access(fid, key)
+            except service_error, e:
+                if e.code == service_error.access:
+                    continue
+                else:
+                    self.state_lock.release()
+                    raise e
 
             if self.state.has_key(key):