]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fixes 'ovs-agent fails to start on Windows beacause of SIGHUP'
authorAdelina Tuvenie <atuvenie@cloudbasesolutions.com>
Thu, 24 Sep 2015 13:17:06 +0000 (06:17 -0700)
committerKyle Mestery <mestery@mestery.com>
Fri, 2 Oct 2015 16:00:24 +0000 (16:00 +0000)
Change Ic0cf8a9ca7f3a16b556a6825e2979471ae136c33 has added the handling
of SIGHUP in neutron_ovs_agent. This does not work on Windows as there is
no SIGHUP signal on windows.

The fix consists in checking if signal has SIGHUP attr before setting the handler
for SIGHUP.

Change-Id: I08258580252d68db222cbb9db7812ff1dfb37a56
Closes-Bug: #1499345
(cherry picked from commit 584bb1aad8647872cb8722beeb84e9ec08abc208)

neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py

index fc7e0c832b60c612018797ab6dc72084cbbf4c4e..b18716e861375ecb9fcb7c515388af461fe16154 100644 (file)
@@ -1784,7 +1784,8 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         # Start everything.
         LOG.info(_LI("Agent initialized successfully, now running... "))
         signal.signal(signal.SIGTERM, self._handle_sigterm)
-        signal.signal(signal.SIGHUP, self._handle_sighup)
+        if hasattr(signal, 'SIGHUP'):
+            signal.signal(signal.SIGHUP, self._handle_sighup)
         with polling.get_polling_manager(
             self.minimize_polling,
             self.ovsdb_monitor_respawn_interval) as pm: