44a2b8949f
As a work-around to deal with bug 1075838, we modified monkey_patch in the Cinder binaries. The root cause of the issue is/was actually a bug in eventlet but this was a quick work-around. Since the change Change-Id: I69ba75136e32e95c6fdf108f0c4fe21a5e3bdbe6 to do this landed, the problem has also been addressed in Keystone. So, let's revert this patch to get back the greenthread performance that we may have lost with this change. For now, everything should be addressed as long as we don't implement multi api worker in Cinder, if we do and the evenlet fix hasn't been released we'll need to turn the modification back on for bin/cinder-api. Change-Id: Ie845bade85dbceacd91f15e082325602d9a79c74
69 lines
2.2 KiB
Python
Executable File
69 lines
2.2 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2011 OpenStack, LLC
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# 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 All cinder services.
|
|
|
|
This script attempts to start all the cinder services in one process. Each
|
|
service is started in its own greenthread. Please note that exceptions and
|
|
sys.exit() on the starting of a service are logged and the script will
|
|
continue attempting to launch the rest of the services.
|
|
|
|
"""
|
|
|
|
import eventlet
|
|
eventlet.monkey_patch()
|
|
|
|
import os
|
|
import sys
|
|
|
|
|
|
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
|
|
sys.argv[0]), os.pardir, os.pardir))
|
|
if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
|
|
sys.path.insert(0, possible_topdir)
|
|
|
|
|
|
from cinder import flags
|
|
from cinder.openstack.common import log as logging
|
|
from cinder import service
|
|
from cinder import utils
|
|
|
|
|
|
LOG = logging.getLogger('cinder.all')
|
|
|
|
if __name__ == '__main__':
|
|
flags.parse_args(sys.argv)
|
|
logging.setup("cinder")
|
|
utils.monkey_patch()
|
|
servers = []
|
|
# cinder-api
|
|
try:
|
|
servers.append(service.WSGIService('osapi_volume'))
|
|
except (Exception, SystemExit):
|
|
logging.exception(_('Failed to load %s') % '%s-api' % api)
|
|
|
|
for binary in ['cinder-volume', 'cinder-scheduler']:
|
|
try:
|
|
servers.append(service.Service.create(binary=binary))
|
|
except (Exception, SystemExit):
|
|
LOG.exception(_('Failed to load %s'), binary)
|
|
service.serve(*servers)
|
|
service.wait()
|