Changeset 4ea1e22

Timestamp:

Jul 27, 2009 7:56:29 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:

d5e3b8e

Parents:

fc36019

Message:

make sure that subprocesses aren\'t holding the server sockets open.

File:

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

fedd/federation/experiment_control.py

@@ -538 +538 @@
             self.log.debug("[scp_file]: %s" % " ".join(scp_cmd))
             if not self.debug:
-                rv = call(scp_cmd, stdout=dnull, stderr=dnull)
+                rv = call(scp_cmd, stdout=dnull, stderr=dnull, close_fds=True,
+                        close_fds=True)
 
             return rv == 0
@@ -563 +564 @@
             if not self.debug:
                 if dnull:
-                    sub = Popen(sh_str, shell=True, stdout=dnull, stderr=dnull)
+                    sub = Popen(sh_str, shell=True, stdout=dnull, stderr=dnull,
+                            close_fds=True)
                 else:
-                    sub = Popen(sh_str, shell=True)
+                    sub = Popen(sh_str, shell=True,
+                            close_fds=True)
                 if timeout:
                     i = 0
@@ -648 +651 @@
                 rv = 0
             else:
-                status = Popen(cmd, stdout=PIPE, stderr=dev_null)
+                status = Popen(cmd, stdout=PIPE, stderr=dev_null,
+                        close_fds=True)
                 for line in status.stdout:
                     m = state_re.match(line)
@@ -855 +859 @@
         # May raise CalledProcessError
         self.log.debug("[generate_ssh_keys]: %s" % " ".join(cmd))
-        rv = call(cmd, stdout=trace, stderr=trace)
+        rv = call(cmd, stdout=trace, stderr=trace, close_fds=True)
         if rv != 0:
             raise service_error(service_error.internal, 
@@ -999 +1003 @@
         # Use dot to create a visualization
         dot = Popen([neato, '-Gstart=rand', '-Gepsilon=0.005', '-Gmaxiter=2000',
-                '-Gpack=true', dotname], stdout=PIPE)
+                '-Gpack=true', dotname], stdout=PIPE, close_fds=True)
 
         # Translate dot to vis format
@@ -1895 +1899 @@
 
                 self.log.debug("running local splitter %s", " ".join(tclcmd))
-                tclparser = Popen(tclcmd, stdout=PIPE)
+                tclparser = Popen(tclcmd, stdout=PIPE, close_fds=True)
                 split_data = tclparser.stdout