openstack/devstack
Code Issues Proposed changes

Merge "Disable waiting forever for connpool workers"

Browse Source
This commit is contained in:
Zuul 2023-08-09 03:06:35 +00:00 committed by Gerrit Code Review
commit d7ab61747a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/apache
View File

@ -290,7 +290,7 @@ function write_uwsgi_config {
apache_conf=$(apache_site_config_for $name) apache_conf=$(apache_site_config_for $name)
iniset "$file" uwsgi socket "$socket" iniset "$file" uwsgi socket "$socket"
iniset "$file" uwsgi chmod-socket 666 iniset "$file" uwsgi chmod-socket 666
echo "ProxyPass \"${url}\" \"unix:${socket}|uwsgi://uwsgi-uds-${name}\" retry=0 " | sudo tee -a $apache_conf echo "ProxyPass \"${url}\" \"unix:${socket}|uwsgi://uwsgi-uds-${name}\" retry=0 acquire=1 " | sudo tee -a $apache_conf
enable_apache_site $name enable_apache_site $name
restart_apache_server restart_apache_server
fi fi
@ -351,7 +351,7 @@ function write_local_uwsgi_http_config {
apache_conf=$(apache_site_config_for $name) apache_conf=$(apache_site_config_for $name)
echo "KeepAlive Off" | sudo tee $apache_conf echo "KeepAlive Off" | sudo tee $apache_conf
echo "SetEnv proxy-sendchunked 1" | sudo tee -a $apache_conf echo "SetEnv proxy-sendchunked 1" | sudo tee -a $apache_conf
echo "ProxyPass \"${url}\" \"http://$APACHE_LOCAL_HOST:$port\" retry=0 " | sudo tee -a $apache_conf echo "ProxyPass \"${url}\" \"http://$APACHE_LOCAL_HOST:$port\" retry=0 acquire=1 " | sudo tee -a $apache_conf
enable_apache_site $name enable_apache_site $name
restart_apache_server restart_apache_server
} }
@ -370,7 +370,7 @@ function write_local_proxy_http_config {
echo "KeepAlive Off" | sudo tee $apache_conf echo "KeepAlive Off" | sudo tee $apache_conf
echo "SetEnv proxy-sendchunked 1" | sudo tee -a $apache_conf echo "SetEnv proxy-sendchunked 1" | sudo tee -a $apache_conf
echo "ProxyPass \"${loc}\" \"$url\" retry=0 " | sudo tee -a $apache_conf echo "ProxyPass \"${loc}\" \"$url\" retry=0 acquire=1 " | sudo tee -a $apache_conf
enable_apache_site $name enable_apache_site $name
restart_apache_server restart_apache_server
} }

4
lib/tls
View File

@ -541,9 +541,11 @@ $listen_string
# Avoid races (at the cost of performance) to re-use a pooled connection # Avoid races (at the cost of performance) to re-use a pooled connection
# where the connection is closed (bug 1807518). # where the connection is closed (bug 1807518).
# Set acquire=1 to disable waiting for connection pool members so that
# we can determine when apache is overloaded (returns 503).
SetEnv proxy-initial-not-pooled SetEnv proxy-initial-not-pooled
<Location /> <Location />
ProxyPass http://$b_host:$b_port/ retry=0 nocanon ProxyPass http://$b_host:$b_port/ retry=0 nocanon acquire=1
ProxyPassReverse http://$b_host:$b_port/ ProxyPassReverse http://$b_host:$b_port/
</Location> </Location>
ErrorLog $APACHE_LOG_DIR/tls-proxy_error.log ErrorLog $APACHE_LOG_DIR/tls-proxy_error.log