URL: https://github.com/SSSD/sssd/pull/636 Author: pbrezina Title: #636: failover: tune up default timeouts Action: synchronized
To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/636/head:pr636 git checkout pr636
From 6beb8a4e09db52036f583d752bbfc13e2d0b36d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com> Date: Mon, 13 Aug 2018 12:21:13 +0200 Subject: [PATCH] failover: tune up default timeouts Resolves: https://pagure.io/SSSD/sssd/issue/3217 --- src/man/include/failover.xml | 6 ++++++ src/man/sssd-ldap.5.xml | 2 +- src/providers/ad/ad_opts.c | 2 +- src/providers/data_provider_fo.c | 2 +- src/providers/ipa/ipa_opts.c | 2 +- src/providers/ldap/ldap_opts.c | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/man/include/failover.xml b/src/man/include/failover.xml index cd6fd4d798..1eb7aa2bd9 100644 --- a/src/man/include/failover.xml +++ b/src/man/include/failover.xml @@ -79,6 +79,9 @@ <para> How long would SSSD talk to a single DNS server. </para> + <para> + Default: 6 + </para> </listitem> </varlistentry> <varlistentry> @@ -92,6 +95,9 @@ include several steps, such as resolving DNS SRV queries or locating the site. </para> + <para> + Default: 18 + </para> </listitem> </varlistentry> </variablelist> diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index b30a54f19e..d6c0d7f3f3 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -1432,7 +1432,7 @@ StartTLS operation. </para> <para> - Default: 6 + Default: 24 </para> </listitem> </varlistentry> diff --git a/src/providers/ad/ad_opts.c b/src/providers/ad/ad_opts.c index f2ca215393..64762d0891 100644 --- a/src/providers/ad/ad_opts.c +++ b/src/providers/ad/ad_opts.c @@ -65,7 +65,7 @@ struct dp_option ad_def_ldap_opts[] = { { "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB }, { "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, - { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, + { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 24 }, NULL_NUMBER }, { "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING }, { "ldap_user_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_user_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING }, diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c index 473b667e58..7642a183c4 100644 --- a/src/providers/data_provider_fo.c +++ b/src/providers/data_provider_fo.c @@ -831,7 +831,7 @@ void _be_fo_set_port_status(struct be_ctx *ctx, /* Resolver back end interface */ static struct dp_option dp_res_default_opts[] = { { "lookup_family_order", DP_OPT_STRING, { "ipv4_first" }, NULL_STRING }, - { "dns_resolver_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, + { "dns_resolver_timeout", DP_OPT_NUMBER, { .number = 18 }, NULL_NUMBER }, { "dns_resolver_op_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "dns_discovery_domain", DP_OPT_STRING, NULL_STRING, NULL_STRING }, DP_OPTION_TERMINATOR diff --git a/src/providers/ipa/ipa_opts.c b/src/providers/ipa/ipa_opts.c index 313193fdb4..1b725a23c4 100644 --- a/src/providers/ipa/ipa_opts.c +++ b/src/providers/ipa/ipa_opts.c @@ -76,7 +76,7 @@ struct dp_option ipa_def_ldap_opts[] = { { "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB }, { "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, - { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, + { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 24 }, NULL_NUMBER }, { "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING }, { "ldap_user_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_user_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING }, diff --git a/src/providers/ldap/ldap_opts.c b/src/providers/ldap/ldap_opts.c index 2482d90eaf..0c36a54b35 100644 --- a/src/providers/ldap/ldap_opts.c +++ b/src/providers/ldap/ldap_opts.c @@ -36,7 +36,7 @@ struct dp_option default_basic_opts[] = { { "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB }, { "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, - { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, + { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 24 }, NULL_NUMBER }, { "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING }, { "ldap_user_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_user_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING },
_______________________________________________ sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org
