service child process normal SIGTERM exit

service.py had some code where the child process would catch the
SIGTERM from the parent just so it could exit with 1 status rather
than with an indication that it exited due to SIGTERM. When
shutting down the parent doesn't care in what way the child ended,
only that they're all gone, so this code is unnecessary.

Also, for some reason this caused the child to never exit while
there was an open connection from a client. Probably something
with eventlet and signal handling.

This is a cherry-pick of oslo-incubator commit
702bc569987854b602ef189655c201c348de84cb .

Change-Id: I87f3ca4da64fb8070e4d6c3876a2f1ce1a3ca71d
Closes-Bug: #1446583

diff --git a/cinder/openstack/common/service.py b/cinder/openstack/common/service.py
index 910d2bbbcc1b9f0b8599b9b5cc6bedef68ad206c..c0701033e81319a47f55b73ba0a64dbedb183c64 100644 (file)
--- a/cinder/openstack/common/service.py
+++ b/cinder/openstack/common/service.py
@@ -234,15 +234,12 @@ class ProcessLauncher(object):
 
     def _child_process_handle_signal(self):
         # Setup child signal handlers differently
-        def _sigterm(*args):
-            signal.signal(signal.SIGTERM, signal.SIG_DFL)
-            raise SignalExit(signal.SIGTERM)
-
         def _sighup(*args):
             signal.signal(signal.SIGHUP, signal.SIG_DFL)
             raise SignalExit(signal.SIGHUP)
 
-        signal.signal(signal.SIGTERM, _sigterm)
+        # Parent signals with SIGTERM when it wants us to go away.
+        signal.signal(signal.SIGTERM, signal.SIG_DFL)
         if _sighup_supported():
             signal.signal(signal.SIGHUP, _sighup)
         # Block SIGINT and let the parent send us a SIGTERM