summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2012-09-20 14:11:38 +0200
committerThierry Carrez <thierry@openstack.org>2012-09-20 15:24:14 +0200
commita694b9e5adec8236ce8b2cd4832f8dc4912de6fc (patch)
tree10ae4b27b612a39fe6e1c86035298c70bd4ffb32 /nova
parent59ad151a296c22d8be053e408d9377acebb5ad15 (diff)
downloadnova-a694b9e5adec8236ce8b2cd4832f8dc4912de6fc.tar.gz
nova-a694b9e5adec8236ce8b2cd4832f8dc4912de6fc.tar.xz
nova-a694b9e5adec8236ce8b2cd4832f8dc4912de6fc.zip
Restore SIGPIPE default action for subprocesses
Python ignores SIGPIPE on startup, because it prefers to check every write and raise an IOError exception rather than taking the signal. Most Unix subprocesses don't expect to work this way. This patch (adapted from Colin Watson's post at http://tinyurl.com/2a7mzh5) sets SIGPIPE back to the default action for nova.utils.execute and nova-rootwrap created subprocesses. Fixes bug 1053364 Change-Id: I17e1629bb4ef4268515c6734ddb6e12746739c52
Diffstat (limited to 'nova')
-rw-r--r--nova/utils.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py
index f2642f07c..015ff915a 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -31,6 +31,7 @@ import random
import re
import shlex
import shutil
+import signal
import socket
import struct
import sys
@@ -112,6 +113,12 @@ def vpn_ping(address, port, timeout=0.05, session_id=None):
return server_sess
+def _subprocess_setup():
+ # Python installs a SIGPIPE handler by default. This is usually not what
+ # non-Python subprocesses expect.
+ signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+
def execute(*cmd, **kwargs):
"""Helper method to execute command with optional retry.
@@ -180,6 +187,7 @@ def execute(*cmd, **kwargs):
stdout=_PIPE,
stderr=_PIPE,
close_fds=True,
+ preexec_fn=_subprocess_setup,
shell=shell)
result = None
if process_input is not None: