diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5 index 24e41aef84..45531685c6 100644 --- a/doc/manpages/proxy-server.conf.5 +++ b/doc/manpages/proxy-server.conf.5 @@ -1002,8 +1002,6 @@ The valid values for sorting_method are "affinity", "shuffle", and "timing". .IP \fBtiming_expiry\fR If the "timing" sorting_method is used, the timings will only be valid for the number of seconds configured by timing_expiry. The default is 300. -.IP \fBmax_large_object_get_time\fR -The maximum time (seconds) that a large object connection is allowed to last. The default is 86400. .IP \fBrequest_node_count\fR Set to the number of nodes to contact for a normal request. You can use '* replicas' at the end to have it use the number given times the number of diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index 59c5cc02aa..c1f1cfc744 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -171,9 +171,6 @@ use = egg:swift#proxy # the number of seconds configured by timing_expiry. # timing_expiry = 300 # -# The maximum time (seconds) that a large object connection is allowed to last. -# max_large_object_get_time = 86400 -# # Set to the number of nodes to contact for a normal request. You can use # '* replicas' at the end to have it use the number given times the number of # replicas for the ring being used for the request. diff --git a/swift/proxy/server.py b/swift/proxy/server.py index d4a31e5a9d..1f23e9bb20 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -147,8 +147,6 @@ class Application(object): self.node_timings = {} self.timing_expiry = int(conf.get('timing_expiry', 300)) self.sorting_method = conf.get('sorting_method', 'shuffle').lower() - self.max_large_object_get_time = float( - conf.get('max_large_object_get_time', '86400')) value = conf.get('request_node_count', '2 * replicas').lower().split() if len(value) == 1: rnc_value = int(value[0])