61b231a999
We spawn a lot of neutron-servers, on all but the smallest systems. It's often hard to tell which are busy/overloaded or spinning. Add an option to set the process names to their role. This has a small chance of breaking existing scripting, depending how they're parsing ps output. Sample output: $ ps xw | grep neutron-server 1126 pts/2 S+ 0:00 grep --color=auto neutron-server 25355 ? Ss 0:26 /usr/bin/python /usr/local/bin/neutron-server \ --config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/plugins/ml2/ml2_conf.ini 25368 ? S 0:00 neutron-server: api worker 25369 ? S 0:00 neutron-server: api worker 25370 ? S 0:00 neutron-server: api worker 25371 ? S 0:00 neutron-server: api worker 25372 ? S 0:02 neutron-server: rpc worker 25373 ? S 0:02 neutron-server: rpc worker 25374 ? S 0:02 neutron-server: services worker The "normal" looking ps output is the main parent. Partial-Bug: #1816485 Depends-On: https://review.openstack.org/637119 Change-Id: I0e664a5f8e792d85b8f5483fb8c6f1cd59a677cd
107 lines
3.8 KiB
Python
107 lines
3.8 KiB
Python
# Copyright 2015 Mirantis Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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 mock
|
|
|
|
from neutron_lib.callbacks import events
|
|
from neutron_lib.callbacks import registry
|
|
from neutron_lib.callbacks import resources
|
|
from oslo_concurrency import processutils
|
|
from oslo_config import cfg
|
|
|
|
from neutron import service
|
|
from neutron.tests import base
|
|
from neutron.tests.unit import test_wsgi
|
|
|
|
|
|
class TestServiceHelpers(base.BaseTestCase):
|
|
|
|
def test_get_workers(self):
|
|
num_workers = service._get_worker_count()
|
|
self.assertGreaterEqual(num_workers, 1)
|
|
self.assertLessEqual(num_workers, processutils.get_worker_count())
|
|
|
|
|
|
class TestRpcWorker(test_wsgi.TestServiceBase):
|
|
|
|
def test_reset(self):
|
|
_plugin = mock.Mock()
|
|
rpc_worker = service.RpcWorker(_plugin)
|
|
self._test_reset(rpc_worker)
|
|
|
|
|
|
class TestRunRpcWorkers(base.BaseTestCase):
|
|
def setUp(self):
|
|
super(TestRunRpcWorkers, self).setUp()
|
|
self.worker_count = service._get_worker_count()
|
|
|
|
def _test_rpc_workers(self, config_value, expected_passed_value):
|
|
if config_value is not None:
|
|
cfg.CONF.set_override('rpc_workers', config_value)
|
|
with mock.patch('neutron.service.RpcWorker') as mock_rpc_worker:
|
|
with mock.patch('neutron.service.RpcReportsWorker'):
|
|
service._get_rpc_workers(plugin=mock.Mock())
|
|
init_call = mock_rpc_worker.call_args
|
|
expected_call = mock.call(
|
|
mock.ANY, worker_process_count=expected_passed_value)
|
|
self.assertEqual(expected_call, init_call)
|
|
|
|
def test_rpc_workers_zero(self):
|
|
self._test_rpc_workers(0, 1)
|
|
|
|
def test_rpc_workers_default(self):
|
|
self._test_rpc_workers(None, int(self.worker_count / 2))
|
|
|
|
def test_rpc_workers_defined(self):
|
|
self._test_rpc_workers(42, 42)
|
|
|
|
|
|
class TestRunWsgiApp(base.BaseTestCase):
|
|
def setUp(self):
|
|
super(TestRunWsgiApp, self).setUp()
|
|
self.worker_count = service._get_worker_count()
|
|
|
|
def _test_api_workers(self, config_value, expected_passed_value):
|
|
if config_value is not None:
|
|
cfg.CONF.set_override('api_workers', config_value)
|
|
with mock.patch('neutron.wsgi.Server') as mock_server:
|
|
service.run_wsgi_app(mock.sentinel.app)
|
|
start_call = mock_server.return_value.start.call_args
|
|
expected_call = mock.call(
|
|
mock.ANY, mock.ANY, mock.ANY, desc='api worker',
|
|
workers=expected_passed_value)
|
|
self.assertEqual(expected_call, start_call)
|
|
|
|
def test_api_workers_zero(self):
|
|
self._test_api_workers(0, 0)
|
|
|
|
def test_api_workers_default(self):
|
|
self._test_api_workers(None, self.worker_count)
|
|
|
|
def test_api_workers_defined(self):
|
|
self._test_api_workers(42, 42)
|
|
|
|
def test_start_all_workers(self):
|
|
cfg.CONF.set_override('api_workers', 0)
|
|
mock.patch.object(service, '_get_rpc_workers').start()
|
|
mock.patch.object(service, '_get_plugins_workers').start()
|
|
mock.patch.object(service, '_start_workers').start()
|
|
|
|
callback = mock.Mock()
|
|
registry.subscribe(callback, resources.PROCESS, events.AFTER_SPAWN)
|
|
service.start_all_workers()
|
|
callback.assert_called_once_with(
|
|
resources.PROCESS, events.AFTER_SPAWN, mock.ANY, payload=None)
|