nikon/tuned
1
0
Fork 0
Code Activity Actions

fixed fd leaks on subprocesses

Browse source 
resolves: rhbz#890435
Added "close on execute" to all external calls. This workaround could cause
trouble on Windows, but it is unlikely the Tuned will ever run there.
This commit is contained in:
Jaroslav Škarvada 2013-01-02 16:09:56 +01:00
parent df933c4901
commit cf71606eaf
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tuned/plugins/plugin_mounts.py
View file

@ -38,7 +38,7 @@ class MountsPlugin(base.Plugin):
mountpoint_topology = {}
current_disk = None
stdout, stderr = Popen(["/usr/bin/lsblk", "-rno", "TYPE,RM,KNAME,FSTYPE,MOUNTPOINT"], stdout=PIPE, stderr=PIPE).communicate()
stdout, stderr = Popen(["/usr/bin/lsblk", "-rno", "TYPE,RM,KNAME,FSTYPE,MOUNTPOINT"], stdout=PIPE, stderr=PIPE, close_fds=True).communicate()
for columns in map(lambda line: line.split(), stdout.splitlines()):
device_type, device_removable, device_name = columns[:3]
filesystem = columns[3] if len(columns) > 3 else None

2
tuned/plugins/plugin_script.py
View file

@ -32,7 +32,7 @@ class ScriptPlugin(base.Plugin):
for script in self._scripts:
log.info("Calling script %s with arg %s" % (script, arg))
try:
proc = Popen([script, arg], stdout=PIPE, stderr=PIPE)
proc = Popen([script, arg], stdout=PIPE, stderr=PIPE, close_fds=True)
out, err = proc.communicate()
if proc.returncode:

4
tuned/plugins/plugin_sysctl.py
View file

@ -33,9 +33,9 @@ class SysctlPlugin(base.Plugin):
def _exec_sysctl(self, data, write = False):
if write:
log.debug("Setting sysctl: %s" % (data))
proc = Popen(["/sbin/sysctl", "-q", "-w", data], stdout=PIPE, stderr=PIPE)
proc = Popen(["/sbin/sysctl", "-q", "-w", data], stdout=PIPE, stderr=PIPE, close_fds=True)
else:
proc = Popen(["/sbin/sysctl", "-e", data], stdout=PIPE, stderr=PIPE)
proc = Popen(["/sbin/sysctl", "-e", data], stdout=PIPE, stderr=PIPE, close_fds=True)
out, err = proc.communicate()
if proc.returncode:

2
tuned/utils/commands.py
View file

@ -40,7 +40,7 @@ def execute(args):
log.debug("Executing %s." % str(args))
out = ""
try:
proc = Popen(args, stdout=PIPE, stderr=PIPE, env=execute._environment)
proc = Popen(args, stdout=PIPE, stderr=PIPE, env=execute._environment, close_fds=True)
out, err = proc.communicate()
if proc.returncode:

8
tuned/utils/nettool.py
View file

@ -57,13 +57,13 @@ class Nettool:
if not self.supported_autoneg:
return False
return 0 == call(["ethtool", "-s", self._interface, "autoneg", "on" if enable else "off"])
return 0 == call(["ethtool", "-s", self._interface, "autoneg", "on" if enable else "off"], close_fds=True)
def _set_advertise(self, value):
if not self._set_autonegotiation(True):
return False
return 0 == call(["ethtool", "-s", self._interface, "advertise", "0x%03x" % value])
return 0 == call(["ethtool", "-s", self._interface, "advertise", "0x%03x" % value], close_fds=True)
def get_max_speed(self):
max = 0
@ -113,8 +113,8 @@ class Nettool:
# run ethtool and preprocess output
p_ethtool = Popen(["ethtool", self._interface], stdout=PIPE, stderr=PIPE)
p_filter = Popen(["sed", "s/^\s*//;s/:\s*/:\\n/g"], stdin=p_ethtool.stdout, stdout=PIPE)
p_ethtool = Popen(["ethtool", self._interface], stdout=PIPE, stderr=PIPE, close_fds=True)
p_filter = Popen(["sed", "s/^\s*//;s/:\s*/:\\n/g"], stdin=p_ethtool.stdout, stdout=PIPE, close_fds=True)
output = p_filter.communicate()[0]
errors = p_ethtool.communicate()[1]