openstack
/
devstack
Code Issues Proposed changes

Merge "attempt to cut api workers in half"

This commit is contained in:
Jenkins 2015-09-24 19:31:51 +00:00 committed by Gerrit Code Review
parent b6249dc2ad 1ce19ab76d
commit 9f6b7eb3e5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

@ -620,6 +620,8 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS"
iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"
iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"
# don't let the conductor get out of control now that we're using a pure python db driver
iniset $NOVA_CONF conductor workers "$API_WORKERS"
iniset $NOVA_CONF cinder os_region_name "$REGION_NAME"

2
stackrc
View File

@ -650,7 +650,7 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
# the memory used where there are a large number of CPUs present
# (the default number of workers for many services is the number of CPUs)
# Also sets the minimum number of workers to 2.
API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))}
API_WORKERS=${API_WORKERS:=$(( ($(nproc)/4)<2 ? 2 : ($(nproc)/4) ))}
# Service startup timeout
SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}