aea3edc229
Due to the limit of Python interpreter, API service of Manila can't really utilize underlying multi-core architecture even libraries like eventlet has been used. To make API service much more scalable, we'd adopt multi-process (worker) mode that has been used for long in Glance/Swift/Nova/Cinder. The default behavior isn't changed with this patch, Manila API service will still run in one process (default value of osapi_volume_workers is None). Implementation wise, a good portion of manila/service.py has been removed because those content has been merged in Oslo version of service module. manila/wsgi.py is also updated to adopt the change for multiple WSGI servers running in separate processes. DocImpact: 'New config option osapi_share_workers is used to specify number of API service workers (OS processes) to launch for Manila API service. Setting this config option to a proper value (e.g. osapi_share_workers = # of CPU cores/threads of the machine) can greatly improve the total throughput of API service [# of API requests can be handled per second].' Also removed out-dated comments in manila/cmd/api.py due to the fact that this bug [1] has been fixed in eventlet 0.9.13 This commit is port from two Cinder changes - [2] and [3]. [1] https://bitbucket.org/eventlet/eventlet/issue/92/eventletgreen-override-of-oswaitpid [2] I8361d0dc0d43040e48634ff1aee1324e5e0af466 [3] Iab32a3fe230a11692a8cad274304214247d6c2c6 Implement bp: multi-process-api-service Change-Id: I1cb98c938fd4e1dabe75c78a7ef392d6d7387dab
61 lines
1.7 KiB
Python
Executable File
61 lines
1.7 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
# Copyright 2013 NetApp
|
|
# 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.
|
|
|
|
"""Starter script for manila Share."""
|
|
|
|
import eventlet
|
|
eventlet.monkey_patch()
|
|
|
|
import sys
|
|
|
|
from oslo_config import cfg
|
|
from oslo_log import log
|
|
|
|
from manila import i18n
|
|
i18n.enable_lazy()
|
|
|
|
from manila.common import config # Need to register global_opts # noqa
|
|
from manila import service
|
|
from manila import utils
|
|
from manila import version
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
def main():
|
|
log.register_options(CONF)
|
|
CONF(sys.argv[1:], project='manila',
|
|
version=version.version_string())
|
|
log.setup(CONF, "manila")
|
|
utils.monkey_patch()
|
|
launcher = service.process_launcher()
|
|
if CONF.enabled_share_backends:
|
|
for backend in CONF.enabled_share_backends:
|
|
host = "%s@%s" % (CONF.host, backend)
|
|
server = service.Service.create(host=host,
|
|
service_name=backend,
|
|
binary='manila-share')
|
|
launcher.launch_service(server)
|
|
else:
|
|
server = service.Service.create(binary='manila-share')
|
|
launcher.launch_service(server)
|
|
launcher.wait()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|