diff options
| -rw-r--r-- | src/man/include/failover.xml | 2 | ||||
| -rw-r--r-- | src/providers/data_provider_fo.c | 3 | ||||
| -rw-r--r-- | src/providers/fail_over.c | 9 | ||||
| -rw-r--r-- | src/providers/fail_over.h | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/src/man/include/failover.xml b/src/man/include/failover.xml index dbf9d5464..4865ce2be 100644 --- a/src/man/include/failover.xml +++ b/src/man/include/failover.xml @@ -17,7 +17,7 @@ <emphasis>primary</emphasis> and <emphasis>backup</emphasis>. The idea is that servers in the primary list are preferred and backup servers are only searched if no primary servers can be - reached. If a backup server is selected, a timeout of 30 seconds + reached. If a backup server is selected, a timeout of 31 seconds is set. After this timeout SSSD will periodically try to reconnect to one of the primary servers. If it succeeds, it will replace the current active (backup) server. diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c index a1b96be35..69ade47b9 100644 --- a/src/providers/data_provider_fo.c +++ b/src/providers/data_provider_fo.c @@ -531,6 +531,7 @@ static void be_resolve_server_done(struct tevent_req *subreq) struct tevent_req); struct be_resolve_server_state *state = tevent_req_data(req, struct be_resolve_server_state); + time_t timeout = fo_get_service_retry_timeout(state->svc->fo_service) + 1; int ret; ret = be_resolve_server_process(subreq, state, &new_subreq); @@ -546,7 +547,7 @@ static void be_resolve_server_done(struct tevent_req *subreq) /* FIXME: make the timeout configurable */ ret = be_primary_server_timeout_activate(state->ctx, state->ev, state->ctx, state->svc, - 30); + timeout); if (ret != EOK) { goto fail; } diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index f3bba37f7..e7c44174d 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -1555,6 +1555,15 @@ fo_get_server_hostname_last_change(struct fo_server *server) return server->common->last_status_change.tv_sec; } +time_t fo_get_service_retry_timeout(struct fo_service *svc) +{ + if (svc == NULL || svc->ctx == NULL || svc->ctx->opts == NULL) { + return 0; + } + + return svc->ctx->opts->retry_timeout; +} + void fo_reset_services(struct fo_ctx *fo_ctx) { struct fo_service *service; diff --git a/src/providers/fail_over.h b/src/providers/fail_over.h index 0eb212584..1ad081e78 100644 --- a/src/providers/fail_over.h +++ b/src/providers/fail_over.h @@ -192,6 +192,8 @@ time_t fo_get_server_hostname_last_change(struct fo_server *server); int fo_is_srv_lookup(struct fo_server *s); +time_t fo_get_service_retry_timeout(struct fo_service *svc); + void fo_reset_services(struct fo_ctx *fo_ctx); bool fo_svc_has_server(struct fo_service *service, struct fo_server *server); |