Merge "Add client_timeout parameter for object-server.conf"
This commit is contained in:
commit
11a18d1079
|
@ -159,6 +159,11 @@
|
|||
# (optional) Object-auditor size of chunks to read/write to disk.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*client_timeout*]
|
||||
# (optional) Object-server timeout in seconds to read one chunk from a client
|
||||
# external services.
|
||||
# Defaults to 60.
|
||||
#
|
||||
# [*splice*]
|
||||
# (optional) Use splice for zero-copy object GETs. This requires Linux Kernel
|
||||
# version 3.0 or greater.
|
||||
|
@ -204,6 +209,7 @@ define swift::storage::server(
|
|||
$log_statsd_metric_prefix = '',
|
||||
$network_chunk_size = 65536,
|
||||
$disk_chunk_size = 65536,
|
||||
$client_timeout = 60,
|
||||
$auditor_disk_chunk_size = undef,
|
||||
$splice = false,
|
||||
$object_server_mb_per_sync = 512,
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
A new parameter client_timeout has been added to the storage::server class
|
||||
(useful only if type=object). It is similar to the client_timeout parameter
|
||||
used in the proxy class, except that it is for object.
|
|
@ -129,6 +129,14 @@ describe 'swift::storage::server' do
|
|||
let :params do req_params.merge({ :splice => true, }) end
|
||||
it { is_expected.to contain_concat_fragment("swift-#{t}-#{title}").with_content(/^splice\s*=\s*true\s*$/) }
|
||||
end
|
||||
|
||||
describe "when client_timeout is not set" do
|
||||
it { is_expected.to contain_concat_fragment("swift-#{t}-#{title}").with_content(/^client_timeout\s*=\s*60\s*$/) }
|
||||
end
|
||||
describe "when client_timeout is set" do
|
||||
let :params do req_params.merge({ :client_timeout => 30, }) end
|
||||
it { is_expected.to contain_concat_fragment("swift-#{t}-#{title}").with_content(/^client_timeout\s*=\s*30\s*$/) }
|
||||
end
|
||||
end
|
||||
|
||||
describe "when log_udp_port is set" do
|
||||
|
|
|
@ -26,6 +26,7 @@ log_statsd_metric_prefix = <%=@log_statsd_metric_prefix%>
|
|||
<% end -%>
|
||||
network_chunk_size = <%= @network_chunk_size%>
|
||||
disk_chunk_size = <%= @disk_chunk_size%>
|
||||
client_timeout = <%= @client_timeout %>
|
||||
|
||||
[pipeline:main]
|
||||
pipeline = <%= @pipeline.to_a.join(' ') %>
|
||||
|
|
Loading…
Reference in New Issue