Changeset 74572ba

Timestamp:

Sep 13, 2011 9:46:42 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

b5aa64a

Parents:

77d05a5

Message:

Fix collision where user is creating an experiment, an experiment with
that localname exists, and the user cannot overwrite it. (Error was an
uncaught access denied exception.) Not tested yet.

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1103 +1103 @@
             # fall through and do the collision avoidance.
             old_expid = self.get_experiment_fedid(eid)
-            if old_expid and self.check_experiment_access(fid, old_expid):
-                self.state_lock.acquire()
-                status = self.state[eid].get('experimentStatus', None)
-                if status and status == 'failed':
-                    # remove the old access attributes
-                    self.clear_experiment_authorization(eid,
-                            need_state_lock=False)
-                    overwrite = True
-                    del self.state[eid]
-                    del self.state[old_expid]
-                self.state_lock.release()
+            if old_expid:
+                users_experiment = True
+                try:
+                    self.check_experiment_access(fid, old_expid)
+                except service_error, e:
+                    if e.code == service_error.access: users_experiment = False
+                    else: raise e
+                if users_experiment:
+                    self.state_lock.acquire()
+                    status = self.state[eid].get('experimentStatus', None)
+                    if status and status == 'failed':
+                        # remove the old access attributes
+                        self.clear_experiment_authorization(eid,
+                                need_state_lock=False)
+                        overwrite = True
+                        del self.state[eid]
+                        del self.state[old_expid]
+                    self.state_lock.release()
             self.state_lock.acquire()
             while (self.state.has_key(eid) and not overwrite):