proxy: don't use recoverable_node_timeout with x-newest

Code Issues Proposed changes

Object GET requests with a truthy X-Newest header are not resumed if a
backend request times out. The GetOrHeadHandler therefore uses the
regular node_timeout when waiting for a backend connection response,
rather than the possibly shorter recoverable_node_timeout. However,
previously while reading data from a backend response the
recoverable_node_timeout would still be used with X-Newest requests.
This patch simplifies GetOrHeadHandler to never use
recoverable_node_timeout when X-Newest is truthy.
Change-Id: I326278ecb21465f519b281c9f6c2dedbcbb5ff14

This commit is contained in:

Alistair Coles

2024年02月07日 10:57:18 +00:00

parent 8061dfb1c3

commit 2500fbeea9

4 changed files with 15 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
etc/proxy-server.conf-sample

View File

@@ -175,6 +175,7 @@ use = egg:swift#proxy

# 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).

# Does not apply to requests with a truthy X-Newest header value.

# Defaults to node_timeout, should be overridden if node_timeout is set to a

# high number to prevent client timeouts from firing before the proxy server

# has a chance to retry.

proxy: don't use recoverable_node_timeout with x-newest

1 etc/proxy-server.conf-sample Unescape Escape View File

1
etc/proxy-server.conf-sample

View File