From: Willem Jan Withagen Date: Tue, 20 Dec 2016 23:56:43 +0000 (+0100) Subject: common/config_opts.h: FreeBSD timing changed due to no SO_REUSEADDR X-Git-Tag: v12.0.0~348^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5b08de57fb05f4dfe011a3a54e737c68436c531;p=ceph.git common/config_opts.h: FreeBSD timing changed due to no SO_REUSEADDR Some tests could run into max retries if the server is seriously loaded. So allow for more time, and tries. One of the tests that failed was: test-erasure-code-plugins.sh Signed-off-by: Willem Jan Withagen --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 8886266d750a..9324e9a758b6 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -191,8 +191,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)