Merge lp:~raharper/charms/precise/swift-proxy/add-proxy-node-timeout into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

[James Page]

Deploying swift-proxy on physical systems with slowish disks and putting large (>1G) objects would fail with 503 return code. swift-proxy logs included ChunkWrite timeouts. The default timeout to hand off to other services (swift-storage) is 10 seconds. When the swift-storage host was flushing data out to disk; this stalled longer than 10 seconds, failing the operation.

This branch updates swift-proxy to expose new config options:

node-timeout and recoverable-node-timeout. These values are described in upstream:

http://docs.openstack.org/trunk/config-reference/content/proxy-server-conf.html

The default values for the config options were raised to something reasonable that worked for slower disks, 60 seconds and 30 respectively.

Tested on precise-icehouse

=== modified file 'config.yaml'
--- config.yaml	2013-04-15 19:41:45 +0000
+++ config.yaml	2014-06-18 14:18:42 +0000
@@ -106,6 +106,19 @@
     default: true
     type: boolean
     description: Delay authentication to downstream WSGI services.
+  node-timeout:
+    default: 60
+    type: int
+    description: How long the proxy server will wait on responses from the a/c/o servers.
+  recoverable-node-timeout:
+    default: 30
+    type: int
+    description: |
+      How long the proxy server will wait for an initial response and to read a
+      chunk of data from the object servers while serving GET / HEAD requests.
+      Timeouts from these requests can be recovered from so setting this to
+      something lower than node-timeout would provide quicker error recovery
+      while allowing for a longer timeout for non-recoverable requests (PUTs).
   # Manual Keystone configuration.
   keystone-auth-host:
     type: string

=== modified file 'hooks/swift_context.py'
--- hooks/swift_context.py	2014-04-10 16:52:10 +0000
+++ hooks/swift_context.py	2014-06-18 14:18:42 +0000
@@ -139,7 +139,9 @@
             'bind_port': determine_api_port(bind_port),
             'workers': workers,
             'operator_roles': config('operator-roles'),
-            'delay_auth_decision': config('delay-auth-decision')
+            'delay_auth_decision': config('delay-auth-decision'),
+            'node_timeout': config('node-timeout'),
+            'recoverable_node_timeout': config('recoverable-node-timeout'),
         }
 
         ctxt['ssl'] = False

=== modified file 'revision'
--- revision	2013-09-27 12:02:37 +0000
+++ revision	2014-06-18 14:18:42 +0000
@@ -1,1 +1,1 @@
-146
+147

=== modified file 'templates/essex/proxy-server.conf'
--- templates/essex/proxy-server.conf	2014-02-27 12:17:53 +0000
+++ templates/essex/proxy-server.conf	2014-06-18 14:18:42 +0000
@@ -19,6 +19,8 @@
 use = egg:swift#proxy
 allow_account_management = true
 {% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+node_timeout = {{ node_timeout }}
+recoverable_node_timeout = {{ recoverable_node_timeout }}
 
 [filter:tempauth]
 use = egg:swift#tempauth

=== modified file 'templates/grizzly/proxy-server.conf'
--- templates/grizzly/proxy-server.conf	2014-03-27 11:23:24 +0000
+++ templates/grizzly/proxy-server.conf	2014-06-18 14:18:42 +0000
@@ -19,6 +19,8 @@
 use = egg:swift#proxy
 allow_account_management = true
 {% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+node_timeout = {{ node_timeout }}
+recoverable_node_timeout = {{ recoverable_node_timeout }}
 
 [filter:tempauth]
 use = egg:swift#tempauth

=== modified file 'templates/havana/proxy-server.conf'
--- templates/havana/proxy-server.conf	2014-03-27 11:23:24 +0000
+++ templates/havana/proxy-server.conf	2014-06-18 14:18:42 +0000
@@ -19,6 +19,8 @@
 use = egg:swift#proxy
 allow_account_management = true
 {% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+node_timeout = {{ node_timeout }}
+recoverable_node_timeout = {{ recoverable_node_timeout }}
 
 [filter:tempauth]
 use = egg:swift#tempauth

=== modified file 'templates/icehouse/proxy-server.conf'
--- templates/icehouse/proxy-server.conf	2014-04-07 14:44:39 +0000
+++ templates/icehouse/proxy-server.conf	2014-06-18 14:18:42 +0000
@@ -19,6 +19,8 @@
 use = egg:swift#proxy
 allow_account_management = true
 {% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+node_timeout = {{ node_timeout }}
+recoverable_node_timeout = {{ recoverable_node_timeout }}
 
 [filter:tempauth]
 use = egg:swift#tempauth

=== modified file 'unit_tests/test_templates.py'
--- unit_tests/test_templates.py	2013-11-18 11:16:28 +0000
+++ unit_tests/test_templates.py	2014-06-18 14:18:42 +0000
@@ -46,7 +46,7 @@
 
         The os_release is no longer provided as context to the templates.
         """
-        for release in ('essex', 'grizzly', 'havana'):
+        for release in ('essex', 'grizzly', 'havana', 'icehouse'):
             template = self.get_template_for_release(release)
             with open(template.filename, 'r') as template_orig:
                 self.assertNotIn(
@@ -57,7 +57,7 @@
 
     def test_config_renders_for_all_releases(self):
         """The configs render without syntax error."""
-        for release in ('essex', 'grizzly', 'havana'):
+        for release in ('essex', 'grizzly', 'havana', 'icehouse'):
             template = self.get_template_for_release(release)
 
             result = template.render()