483c5982c0
This reverts commit b1cdba1696
Original patch was reverted because it broke neutron plugin's
backward compatibility and needed more work.
This patch fixes that problems:
1) original behaviour of add_agent_status_check,
start_periodic_l3_agent_status_check and
start_periodic_dhcp_agent_status_check methods is deprecated but kept
for using in third part plugins for backward compatibility
2) new add_agent_status_check_worker, add_periodic_l3_agent_status_check
and add_periodic_dhcp_agent_status_check method are implemented
instead and are used for implementing plugins in neutron codebase
Closes-Bug: #1569404
Change-Id: I3a32a95489831f0d862930384309eefdc881d8f6
48 lines
1.5 KiB
Python
48 lines
1.5 KiB
Python
#!/usr/bin/env python
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import eventlet
|
|
|
|
from oslo_log import log
|
|
|
|
from neutron._i18n import _LI
|
|
from neutron import service
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
def eventlet_wsgi_server():
|
|
neutron_api = service.serve_wsgi(service.NeutronApiService)
|
|
start_api_and_rpc_workers(neutron_api)
|
|
|
|
|
|
def start_api_and_rpc_workers(neutron_api):
|
|
try:
|
|
worker_launcher = service.start_all_workers()
|
|
|
|
pool = eventlet.GreenPool()
|
|
api_thread = pool.spawn(neutron_api.wait)
|
|
plugin_workers_thread = pool.spawn(worker_launcher.wait)
|
|
|
|
# api and other workers should die together. When one dies,
|
|
# kill the other.
|
|
api_thread.link(lambda gt: plugin_workers_thread.kill())
|
|
plugin_workers_thread.link(lambda gt: api_thread.kill())
|
|
|
|
pool.waitall()
|
|
except NotImplementedError:
|
|
LOG.info(_LI("RPC was already started in parent process by "
|
|
"plugin."))
|
|
|
|
neutron_api.wait()
|