openstack/designate
Code Issues Proposed changes

Revert "Move back to mod_wsgi for devstack"

Browse Source 
This reverts commit 185d92d230.

Reason for revert: Lets try to move back to uwsgi, as logging is a lot cleaner in the CI with uwsgi. Switches uwsgi from using uwsgi over socket to over localhost HTTP.

This patch also bumps the API_WORKERS setting for devstack from 2 to 4.
This will bump the uwsgi processes and threads from two to four.

Change-Id: I126133564e2ada32448ad36e0d021790939425d4
This commit is contained in:
Erik Olof Gunnar Andersson 2021-04-08 21:28:39 +00:00 committed by Michael Johnson
parent 77f2396342
commit 4b58446d37
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -6,6 +6,7 @@
DESIGNATE_SERVICE_PORT_DNS: 5322 DESIGNATE_SERVICE_PORT_DNS: 5322
TEMPEST_PLUGINS: /opt/stack/designate-tempest-plugin TEMPEST_PLUGINS: /opt/stack/designate-tempest-plugin
USE_PYTHON3: true USE_PYTHON3: true
API_WORKERS: 4
devstack_plugins: devstack_plugins:
designate: https://opendev.org/openstack/designate designate: https://opendev.org/openstack/designate
devstack_services: devstack_services:

3
designate/api/middleware.py
View File

@ -237,6 +237,7 @@ class FaultWrapperMiddleware(base.Middleware):
try: try:
return request.get_response(self.application) return request.get_response(self.application)
except exceptions.DesignateException as e: except exceptions.DesignateException as e:
LOG.exception(e)
# Handle Designate Exceptions # Handle Designate Exceptions
status = e.error_code if hasattr(e, 'error_code') else 500 status = e.error_code if hasattr(e, 'error_code') else 500
@ -256,6 +257,7 @@ class FaultWrapperMiddleware(base.Middleware):
return self._handle_exception(request, e, status, response) return self._handle_exception(request, e, status, response)
except messaging.MessagingTimeout as e: except messaging.MessagingTimeout as e:
LOG.exception(e)
# Special case for RPC timeout's # Special case for RPC timeout's
response = { response = {
'code': 504, 'code': 504,
@ -264,6 +266,7 @@ class FaultWrapperMiddleware(base.Middleware):
return self._handle_exception(request, e, 504, response) return self._handle_exception(request, e, 504, response)
except Exception as e: except Exception as e:
LOG.exception(e)
# Handle all other exception types # Handle all other exception types
return self._handle_exception(request, e) return self._handle_exception(request, e)

5
devstack/plugin.sh
View File

@ -122,6 +122,11 @@ function configure_designate {
if [[ "$DESIGNATE_WSGI_MODE" == "uwsgi" ]]; then if [[ "$DESIGNATE_WSGI_MODE" == "uwsgi" ]]; then
write_uwsgi_config "$DESIGNATE_UWSGI_CONF" "$DESIGNATE_UWSGI" "/dns" write_uwsgi_config "$DESIGNATE_UWSGI_CONF" "$DESIGNATE_UWSGI" "/dns"
# We are using the http transport to work around an issue with
# broken connections when using the uwsgi protocol of a local socket
# See bug: https://github.com/unbit/uwsgi/issues/2368
echo 'ProxyPass "/dns" "http://127.0.0.1:60053" retry=0' | sudo tee /etc/apache2/sites-available/designate-api-wsgi.conf
iniset $DESIGNATE_UWSGI_CONF uwsgi http-socket 127.0.0.1:60053
else else
_config_designate_apache_wsgi _config_designate_apache_wsgi
fi fi

2
devstack/settings
View File

@ -10,7 +10,7 @@ DESIGNATE_PERIODIC_SYNC_INTERVAL=${DESIGNATE_PERIODIC_SYNC_INTERVAL:-1800}
DESIGNATE_COORDINATION_URL=${DESIGNATE_COORDINATION_URL:-"memcached://127.0.0.1:11211"} DESIGNATE_COORDINATION_URL=${DESIGNATE_COORDINATION_URL:-"memcached://127.0.0.1:11211"}
DESIGNATE_POLL_INTERVAL=${DESIGNATE_POLL_INTERVAL:-5} DESIGNATE_POLL_INTERVAL=${DESIGNATE_POLL_INTERVAL:-5}
DESIGNATE_POLL_RETRIES=${DESIGNATE_POLL_RETRIES:-6} DESIGNATE_POLL_RETRIES=${DESIGNATE_POLL_RETRIES:-6}
DESIGNATE_WSGI_MODE=${DESIGNATE_WSGI_MODE:-"mod_wsgi"} DESIGNATE_WSGI_MODE=${DESIGNATE_WSGI_MODE:-"uwsgi"}
# Quota Options # Quota Options
DESIGNATE_QUOTA_ZONES=${DESIGNATE_QUOTA_ZONES:-10} DESIGNATE_QUOTA_ZONES=${DESIGNATE_QUOTA_ZONES:-10}