507555a585
Currently we create the ThreadGroupManager and EngineListener objects in the service constructor, which is not necessarily going to work if multiple worker processes are specified in the config file (which fork multiple workers after the constructor). The ThreadGroupManager appears to work, even when it is created before the fork, but this is due to some magic in the oslo ProcessLauncher implementation which decouples parent/child use of the eventlet hub. So instead, we move all service startup code into the start() method, which is the entry point for services, triggered via the oslo Services class run_service method: - Don't create anything common to the workers in the constructor - Move ThreadGroup and EngineListener creation into start() - Create the periodic tasks from bin/heat-engine, which means the periodic tasks will only be created by the parent, not duplicated in every worker process. These changes should mean we work correctly with both the ServiceLauncher (num_engine_workers==1) and ProcessLauncher(num_engine_workers>1) oslo abstractions, and solves the issues observed when running multiple workers with the impl_qpid rpc_backend. Change-Id: If3a11050a03660560a364dec871f85c4b56c1c25 Closes-Bug: #1321303
68 lines
2.4 KiB
Python
Executable File
68 lines
2.4 KiB
Python
Executable File
#!/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.
|
|
|
|
"""
|
|
Heat Engine Server. This does the work of actually implementing the API
|
|
calls made by the user. Normal communications is done via the heat API
|
|
which then calls into this engine.
|
|
"""
|
|
|
|
import eventlet
|
|
eventlet.monkey_patch()
|
|
|
|
import os
|
|
import sys
|
|
|
|
# If ../heat/__init__.py exists, add ../ to Python search path, so that
|
|
# it will override what happens to be installed in /usr/(local/)lib/python...
|
|
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, 'heat', '__init__.py')):
|
|
sys.path.insert(0, POSSIBLE_TOPDIR)
|
|
|
|
from oslo.config import cfg
|
|
|
|
from heat.common import notify
|
|
from heat.openstack.common import gettextutils
|
|
from heat.openstack.common import log as logging
|
|
from heat.openstack.common import service
|
|
from heat.rpc import api as rpc_api
|
|
|
|
gettextutils.enable_lazy()
|
|
gettextutils.install('heat', lazy=True)
|
|
|
|
LOG = logging.getLogger('heat.engine')
|
|
|
|
if __name__ == '__main__':
|
|
|
|
cfg.CONF(project='heat', prog='heat-engine')
|
|
cfg.CONF.default_log_levels = ['amqplib=WARN',
|
|
'sqlalchemy=WARN',
|
|
'qpid.messaging=INFO',
|
|
'keystone=INFO',
|
|
'eventlet.wsgi.server=WARN',
|
|
]
|
|
logging.setup('heat')
|
|
|
|
from heat.engine import service as engine
|
|
|
|
srv = engine.EngineService(cfg.CONF.host, rpc_api.ENGINE_TOPIC)
|
|
launcher = service.launch(srv, workers=cfg.CONF.num_engine_workers)
|
|
# We create the periodic tasks here, which mean they are created
|
|
# only in the parent process when num_engine_workers>1 is specified
|
|
srv.create_periodic_tasks()
|
|
notify.startup_notify(cfg.CONF.onready)
|
|
launcher.wait()
|