Changeset 55c074c

Timestamp:

Jul 21, 2009 2:44:49 PM (15 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:

2c9fff0

Parents:

866c983

Message:

untested scripting of fs mods

File:

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

fedd/federation/experiment_control.py

@@ -602 +602 @@
         if not self.scp_file("%s/%s/%s" % (tmpdir, tb, tclfile), user, host):
             return False
-        # Clear the federation config dirs
-        if not self.ssh_cmd(user, host, 
-                "/bin/sh -c \"'/bin/rm -rf %s'\"" % proj_dir):
-            return False
-        # Clear and create the tarfiles and rpm directories
-        for d in (tarfiles_dir, rpms_dir):
-            if not self.ssh_cmd(user, host, 
-                    "/bin/sh -c \"'/bin/rm -rf %s/*'\"" % d):
-                return False
-            if not self.ssh_cmd(user, host, "mkdir -p %s" % d, 
-                    "create tarfiles"):
-                return False
         
         if state == 'none':
@@ -627 +615 @@
                 return False
         
-        # Create the federation config dirs
-        if not self.ssh_cmd(user, host, 
-                "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir):
+        # Open up a temporary file to contain a script for setting up the
+        # filespace for the new experiment.
+        self.log.info("[start_segment]: creating script file")
+        try:
+            sf, scriptname = tempfile.mkstemp()
+            scriptfile = os.fdopen(df, 'w')
+        except IOError:
             return False
+
+        # Script the filesystem changes
+        print >>scriptfile, "/bin/sh -c \"'/bin/rm -rf %s'\"" % proj_dir
+        # Clear and create the tarfiles and rpm directories
+        for d in (tarfiles_dir, rpms_dir):
+            print >>scriptfile, "/bin/sh -c \"'/bin/rm -rf %s/*'\"" % d
+            print >>scriptfile, "mkdir -p %s" % d
+        print >>scriptfile, "/bin/sh -c \"'mkdir -p %s'\"" % proj_dir
+        print >>scriptfile, "rm %s" % scriptfile
+        close(scriptdir)
+
+        # Move the script to the remote machine
+        # XXX: could collide tempfile names on the remote host
+        if self.scp_file(scriptname, user, host, scriptname):
+            os.remove(scriptname)
+        else:
+            return False
+
+        # Execute the script (and the script's last line deletes it)
+        if not self.ssh_cmd(user, host, "sh -x %s" % scriptname):
+            return False
+
         for f in base_confs:
             if not self.scp_file("%s/%s" % (tmpdir, f), user, host,