Merge pull request #12594 from wjwithagen/wip-wjw-freebsd-rebind-timing

common/config_opts.h: FreeBSD timing changed due to no SO_REUSEADDR

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-28 11:54:53 -06:00 committed by GitHub
commit eff4c1c5f3

View File

@ -190,8 +190,14 @@ OPTION(ms_dispatch_throttle_bytes, OPT_U64, 100 << 20)
OPTION(ms_bind_ipv6, OPT_BOOL, false)
OPTION(ms_bind_port_min, OPT_INT, 6800)
OPTION(ms_bind_port_max, OPT_INT, 7300)
#if !defined(__FreeBSD__)
OPTION(ms_bind_retry_count, OPT_INT, 3) // If binding fails, how many times do we retry to bind
OPTION(ms_bind_retry_delay, OPT_INT, 5) // Delay between attemps to bind
#else
// FreeBSD does not use SO_REAUSEADDR so allow for a bit more time per default
OPTION(ms_bind_retry_count, OPT_INT, 6) // If binding fails, how many times do we retry to bind
OPTION(ms_bind_retry_delay, OPT_INT, 6) // Delay between attemps to bind
#endif
OPTION(ms_rwthread_stack_bytes, OPT_U64, 1024 << 10)
OPTION(ms_tcp_read_timeout, OPT_U64, 900)
OPTION(ms_pq_max_tokens_per_priority, OPT_U64, 16777216)