Changeset c8853fd for fedd

Timestamp:

Dec 4, 2008 9:34:07 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

2ac63f7d

Parents:

1b376ca

Message:

Bug with experiment creation

File:

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

fedd/federation/experiment_control.py

@@ -568 +568 @@
         if not self.scp_file("%s/%s/%s" % (tmpdir, tb, tclfile), user, host):
             return False
-        # Clear the federation files
+        # Clear the federation config dirs
         if not self.ssh_cmd(user, host, 
                 "/bin/sh -c \"'/bin/rm -rf %s'\"" % proj_dir):
-            return False
-        if not self.ssh_cmd(user, host, 
-                "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir):
             return False
         # Clear and create the tarfiles and rpm directories
@@ -585 +582 @@
         
         if state == 'active':
+            # Create the federation config dirs (do not move outside the
+            # conditional.  Happens later in new expriment creation)
+            if not self.ssh_cmd(user, host, 
+                    "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir):
+                return False
             # Remote experiment is active.  Modify it.
             for f in base_confs:
@@ -608 +610 @@
             return True
         elif state == "swapped":
+            # Create the federation config dirs (do not move outside the
+            # conditional.  Happens later in new expriment creation)
+            if not self.ssh_cmd(user, host, 
+                    "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir):
+                return False
             # Remote experiment swapped out.  Modify it and swap it in.
             for f in base_confs:
@@ -653 +660 @@
                     "/usr/testbed/bin/startexp -i -f -w -p %s -e %s %s" % \
                             (pid, eid, tclfile), "startexp"):
+                return False
+            # Create the federation config dirs (do not move outside the
+            # conditional.)
+            if not self.ssh_cmd(user, host, 
+                    "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir):
                 return False
             # After startexp the per-experiment directories exist