x/vmware-nsx
Code Issues Proposed changes

Ensure ovsdb-client is stopped when OVS agent dies

Browse Source 
If the OVS agent is killed, the interpreter is killed before any cleanup
is done. This patch adds a signal handler for SIGTERM that exits
normally so that the existing cleanup is done and the ovsdb-client
process is terminated.

Change-Id: Ie4f8ff434098100f4699124403d58caa784084cf
This commit is contained in:
Terry Wilson 2014-01-24 13:04:18 -06:00
parent b4b83be54f
commit 318868fb75
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@ -23,6 +23,7 @@
# @author: Kyle Mestery, Cisco Systems, Inc.
import distutils.version as dist_version
import signal
import sys
import time
@ -1253,6 +1254,10 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.rpc_loop(polling_manager=pm)
def handle_sigterm(signum, frame):
sys.exit(1)
def check_ovs_version(min_required_version, root_helper):
LOG.debug(_("Checking OVS version for VXLAN support"))
installed_klm_version = ovs_lib.get_installed_ovs_klm_version()
@ -1351,6 +1356,7 @@ def main():
cfg.CONF.set_default('ip_lib_force_root', True)
agent = OVSNeutronAgent(**agent_config)
signal.signal(signal.SIGTERM, handle_sigterm)
# Start everything.
LOG.info(_("Agent initialized successfully, now running... "))