linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy: Use Duration types for config defaults (#906) 

It's easy to misconfigure default durations, since they're recorded as
integers and converted to Durations separately.

Now, all default constants that represent durations use const `Duration`
instances (enabled by a recent Rust release).

This fixes #905 which was caused by using the wrong time unit for the
metrics retain time.
This commit is contained in:
Oliver Gould 2018-05-08 10:58:22 -07:00 committed by GitHub
parent f4dba72cc3
commit 68e203a2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
proxy/src/config.rs
View File

@ -162,10 +162,10 @@ const DEFAULT_PRIVATE_LISTENER: &str = "tcp://127.0.0.1:4140";
const DEFAULT_PUBLIC_LISTENER: &str = "tcp://0.0.0.0:4143"; const DEFAULT_PUBLIC_LISTENER: &str = "tcp://0.0.0.0:4143";
const DEFAULT_CONTROL_LISTENER: &str = "tcp://0.0.0.0:4190"; const DEFAULT_CONTROL_LISTENER: &str = "tcp://0.0.0.0:4190";
const DEFAULT_METRICS_LISTENER: &str = "tcp://127.0.0.1:4191"; const DEFAULT_METRICS_LISTENER: &str = "tcp://127.0.0.1:4191";
const DEFAULT_METRICS_RETAIN_IDLE: u64 = 10 * 60; // Ten minutes const DEFAULT_METRICS_RETAIN_IDLE: Duration = Duration::from_secs(10 * 60);
const DEFAULT_PRIVATE_CONNECT_TIMEOUT_MS: u64 = 20; const DEFAULT_PRIVATE_CONNECT_TIMEOUT: Duration = Duration::from_millis(20);
const DEFAULT_PUBLIC_CONNECT_TIMEOUT_MS: u64 = 300; const DEFAULT_PUBLIC_CONNECT_TIMEOUT: Duration = Duration::from_millis(300);
const DEFAULT_BIND_TIMEOUT_MS: u64 = 10_000; // ten seconds, as in Linkerd. const DEFAULT_BIND_TIMEOUT: Duration = Duration::from_secs(10); // same as in Linkerd
const DEFAULT_RESOLV_CONF: &str = "/etc/resolv.conf"; const DEFAULT_RESOLV_CONF: &str = "/etc/resolv.conf";
/// It's assumed that a typical proxy can serve inbound traffic for up to 100 pod-local /// It's assumed that a typical proxy can serve inbound traffic for up to 100 pod-local
@ -242,13 +242,12 @@ impl<'a> TryFrom<&'a Strings> for Config {
.unwrap_or_else(|| Addr::from_str(DEFAULT_METRICS_LISTENER).unwrap()), .unwrap_or_else(|| Addr::from_str(DEFAULT_METRICS_LISTENER).unwrap()),
}, },
private_forward: private_forward?, private_forward: private_forward?,
public_connect_timeout: Duration::from_millis(
public_connect_timeout? public_connect_timeout: public_connect_timeout?.map(Duration::from_millis)
.unwrap_or(DEFAULT_PUBLIC_CONNECT_TIMEOUT_MS) .unwrap_or(DEFAULT_PUBLIC_CONNECT_TIMEOUT),
), private_connect_timeout: private_connect_timeout?.map(Duration::from_millis)
private_connect_timeout: .unwrap_or(DEFAULT_PRIVATE_CONNECT_TIMEOUT),
Duration::from_millis(private_connect_timeout?
.unwrap_or(DEFAULT_PRIVATE_CONNECT_TIMEOUT_MS)),
inbound_ports_disable_protocol_detection: inbound_disable_ports? inbound_ports_disable_protocol_detection: inbound_disable_ports?
.unwrap_or_else(|| default_disable_ports_protocol_detection()), .unwrap_or_else(|| default_disable_ports_protocol_detection()),
outbound_ports_disable_protocol_detection: outbound_disable_ports? outbound_ports_disable_protocol_detection: outbound_disable_ports?
@ -265,12 +264,12 @@ impl<'a> TryFrom<&'a Strings> for Config {
control_host_and_port: control_host_and_port?, control_host_and_port: control_host_and_port?,
event_buffer_capacity: event_buffer_capacity?.unwrap_or(DEFAULT_EVENT_BUFFER_CAPACITY), event_buffer_capacity: event_buffer_capacity?.unwrap_or(DEFAULT_EVENT_BUFFER_CAPACITY),
metrics_retain_idle: Duration::from_millis( metrics_retain_idle: metrics_retain_idle?.map(Duration::from_secs)
metrics_retain_idle?.unwrap_or(DEFAULT_METRICS_RETAIN_IDLE) .unwrap_or(DEFAULT_METRICS_RETAIN_IDLE),
),
bind_timeout: bind_timeout?.map(Duration::from_millis)
.unwrap_or(DEFAULT_BIND_TIMEOUT),
bind_timeout:
Duration::from_millis(bind_timeout?.unwrap_or(DEFAULT_BIND_TIMEOUT_MS)),
pod_namespace: pod_namespace?, pod_namespace: pod_namespace?,
}) })
} }