3b22541a2a
Due to the high memory footprint of current Python ns-metadata-proxy, it has to be replaced with a lighter process to avoid OOM conditions in large environments. This patch spawns haproxy through a process monitor using a pidfile. This allows tracking the process and respawn it if necessary as it was done before. Also, it implements an upgrade path which consists of detecting any running Python instance of ns-metadata-proxy and replacing them by haproxy. Therefore, upgrades will take place by simply restarting neutron-l3-agent and neutron-dhcp-agent. According to /proc/<pid>/smaps, memory footprint goes down from ~50MB to ~1.5MB. Also, haproxy is added to bindep in order to ensure that it's installed. UpgradeImpact Depends-On: I36a5531cacc21c0d4bb7f20d4bec6da65d04c262 Depends-On: Ia37368a7ff38ea48c683a7bad76f87697e194b04 Closes-Bug: #1524916 Change-Id: I5a75cc582dca48defafb440207d10e2f7b4f218b
59 lines
2.1 KiB
Python
59 lines
2.1 KiB
Python
# Copyright (c) 2015 OpenStack Foundation.
|
|
#
|
|
# 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 sys
|
|
|
|
from oslo_config import cfg
|
|
from oslo_service import service
|
|
|
|
from neutron.agent.common import config
|
|
from neutron.agent.linux import external_process
|
|
from neutron.agent.linux import interface
|
|
from neutron.agent.linux import pd
|
|
from neutron.agent.linux import ra
|
|
from neutron.common import config as common_config
|
|
from neutron.common import topics
|
|
from neutron.conf.agent.l3 import config as l3_config
|
|
from neutron.conf.agent.l3 import ha as ha_conf
|
|
from neutron.conf.agent.metadata import config as meta_conf
|
|
from neutron import service as neutron_service
|
|
|
|
|
|
def register_opts(conf):
|
|
l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf)
|
|
ha_conf.register_l3_agent_ha_opts(conf)
|
|
meta_conf.register_meta_conf_opts(meta_conf.SHARED_OPTS, conf)
|
|
config.register_interface_driver_opts_helper(conf)
|
|
config.register_agent_state_opts_helper(conf)
|
|
conf.register_opts(interface.OPTS)
|
|
conf.register_opts(external_process.OPTS)
|
|
conf.register_opts(pd.OPTS)
|
|
conf.register_opts(ra.OPTS)
|
|
config.register_availability_zone_opts_helper(conf)
|
|
|
|
|
|
def main(manager='neutron.agent.l3.agent.L3NATAgentWithStateReport'):
|
|
register_opts(cfg.CONF)
|
|
common_config.init(sys.argv[1:])
|
|
config.setup_logging()
|
|
config.setup_privsep()
|
|
server = neutron_service.Service.create(
|
|
binary='neutron-l3-agent',
|
|
topic=topics.L3_AGENT,
|
|
report_interval=cfg.CONF.AGENT.report_interval,
|
|
manager=manager)
|
|
service.launch(cfg.CONF, server).wait()
|