try primary server after retry_timeout + 1 seconds when switching to backup

https://fedorahosted.org/sssd/ticket/1679

The problem is when we are about to reset the server status, we don't
get through the timeout (30 seconds) because the "switch to primary
server" task is scheduled 30 seconds after fall back to a backup
server. Thus the server status remains "not working" and is resetted
after another 30 seconds.

We need to make sure that the server status is tried after the
timeout period. retry_timeout is currently hardcoded to 30, thus
the change in man page.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c
index a1b96be3..69ade47b 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;
         }