From 8e52fbb2f2c99d6b55f7dc10a3812276ce581301 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 23 Nov 2015 19:34:09 +0000 Subject: [PATCH] Optimise the workers used for all services for the AIO The current default number of worker threads for the AIO consumes too many resources, resulting in gate check failures. This patch implements a set of sane defaults for the AIO, reducing the number of workers for most services to 2. Implements: blueprint gate-split Change-Id: I553c6aa8711fa85434547585d3a56cca47539fa0 --- scripts/bootstrap-aio.sh | 28 ++++++++++++++++++++++++---- scripts/gate-check-commit.sh | 4 ---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh index 702622cc2e..ce3832bde4 100755 --- a/scripts/bootstrap-aio.sh +++ b/scripts/bootstrap-aio.sh @@ -378,10 +378,30 @@ echo "required_kernel: $(uname --kernel-release)" | tee -a /etc/openstack_deploy echo "lxc_container_template_main_apt_repo: ${UBUNTU_REPO}" | tee -a /etc/openstack_deploy/user_variables.yml echo "lxc_container_template_security_apt_repo: ${UBUNTU_SEC_REPO}" | tee -a /etc/openstack_deploy/user_variables.yml -# Set the running neutron workers to 0/1 -echo "neutron_api_workers: 0" | tee -a /etc/openstack_deploy/user_variables.yml -echo "neutron_rpc_workers: 0" | tee -a /etc/openstack_deploy/user_variables.yml -echo "neutron_metadata_workers: 1" | tee -a /etc/openstack_deploy/user_variables.yml +# Optimise the worker settings for an AIO +tee -a /etc/openstack_deploy/user_variables.yml << EOF +ceilometer_api_workers: 2 +ceilometer_collector_workers: 2 +ceilometer_notification_workers: 2 +cinder_osapi_volume_workers: 2 +glance_api_workers: 2 +glance_registry_workers: 2 +heat_api_workers: 2 +heat_engine_workers: 2 +horizon_wsgi_processes: 2 +horizon_wsgi_threads: 2 +keystone_wsgi_processes: 2 +neutron_api_workers: 2 +neutron_metadata_workers: 1 +neutron_rpc_workers: 1 +nova_conductor_workers: 2 +nova_metadata_workers: 2 +nova_osapi_compute_workers: 2 +swift_account_server_workers: 2 +swift_container_server_workers: 2 +swift_object_server_workers: 2 +swift_proxy_server_workers: 2 +EOF # Add in swift vars if needed if [ "${DEPLOY_SWIFT}" == "yes" ]; then diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 411c1926a4..0b2707cb5c 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -106,10 +106,6 @@ echo "lxc_net_address: 10.255.255.1" | tee -a /etc/openstack_deploy/user_variabl echo "lxc_net_netmask: 255.255.255.0" | tee -a /etc/openstack_deploy/user_variables.yml echo "lxc_net_dhcp_range: 10.255.255.2,10.255.255.253" | tee -a /etc/openstack_deploy/user_variables.yml -# Limit the number of processes used by Keystone -# The defaults cause tempest failures in OpenStack CI due to resource constraints -echo "keystone_wsgi_processes: 4" | tee -a /etc/openstack_deploy/user_variables.yml - # Disable the python output buffering so that jenkins gets the output properly export PYTHONUNBUFFERED=1