From dab55626ce859dd519fe108b89fa723a38fb21d1 Mon Sep 17 00:00:00 2001
From: Tomas Halman <thalman@redhat.com>
Date: Wed, 20 Mar 2019 15:44:02 +0100
Subject: [PATCH] Providers: Delay online check on startup
Typical usecase is system startup or network restart. In such
cases SSSD receives several messages from the system about
network change and immediately starts connecting.
With multiple addresses on interface or multiple interfaces
SSSD receives even more messages.
This patch introduces 1s delay for online check after first
message.
Online callback tries 3 times to go online. There is increasing
delay between online checks up to 4s.
Resolves: https://pagure.io/SSSD/sssd/issue/3467
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
(cherry picked from commit fe4288088e6cccf7650e5c5def3bd67be90756be)
---
src/providers/backend.h | 1 +
src/providers/data_provider_be.c | 94 ++++++++++++++++++++++++--------
2 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/src/providers/backend.h b/src/providers/backend.h
index 1fe1c2313..5ab47b29a 100644
--- a/src/providers/backend.h
+++ b/src/providers/backend.h
@@ -112,6 +112,7 @@ struct be_ctx {
struct be_refresh_ctx *refresh_ctx;
size_t check_online_ref_count;
+ int check_online_retry_delay;
struct data_provider *provider;
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index fad6f2801..17513111c 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -50,6 +50,9 @@
#include "resolv/async_resolv.h"
#include "monitor/monitor_interfaces.h"
+#define ONLINE_CB_RETRY 3
+#define ONLINE_CB_RETRY_MAX_DELAY 4
+
static int data_provider_res_init(struct sbus_request *dbus_req, void *data);
static int data_provider_go_offline(struct sbus_request *dbus_req, void *data);
static int data_provider_reset_offline(struct sbus_request *dbus_req, void *data);
@@ -71,7 +74,7 @@ bool be_is_offline(struct be_ctx *ctx)
return ctx->offstat.offline;
}
-static void check_if_online(struct be_ctx *be_ctx);
+static void check_if_online(struct be_ctx *be_ctx, int delay);
static errno_t
try_to_go_online(TALLOC_CTX *mem_ctx,
@@ -82,7 +85,7 @@ try_to_go_online(TALLOC_CTX *mem_ctx,
{
struct be_ctx *ctx = (struct be_ctx*) be_ctx_void;
- check_if_online(ctx);
+ check_if_online(ctx, 0);
return EOK;
}
@@ -247,10 +250,39 @@ static errno_t be_check_online_request(struct be_ctx *be_ctx)
return EOK;
}
+static void check_if_online_delayed(struct tevent_context *ev,
+ struct tevent_timer *tim,
+ struct timeval current_time,
+ void *private_data)
+{
+ errno_t ret;
+ struct be_ctx *be_ctx = talloc_get_type(private_data, struct be_ctx);
+
+ be_run_unconditional_online_cb(be_ctx);
+
+ if (!be_is_offline(be_ctx)) {
+ DEBUG(SSSDBG_TRACE_INTERNAL,
+ "Backend is already online, nothing to do.\n");
+ be_ctx->check_online_ref_count = 0;
+ return;
+ }
+
+ DEBUG(SSSDBG_TRACE_INTERNAL, "Trying to go back online!\n");
+
+ ret = be_check_online_request(be_ctx);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_CRIT_FAILURE, "Unable to create check online req.\n");
+ } else {
+ DEBUG(SSSDBG_TRACE_INTERNAL, "Check online req created.\n");
+ }
+}
+
static void be_check_online_done(struct tevent_req *req)
{
struct be_ctx *be_ctx;
struct dp_reply_std *reply;
+ struct tevent_timer *time_event;
+ struct timeval schedule;
errno_t ret;
be_ctx = tevent_req_callback_data(req, struct be_ctx);
@@ -285,11 +317,24 @@ static void be_check_online_done(struct tevent_req *req)
be_ctx->check_online_ref_count--;
if (reply->dp_error != DP_ERR_OK && be_ctx->check_online_ref_count > 0) {
- ret = be_check_online_request(be_ctx);
- if (ret != EOK) {
- DEBUG(SSSDBG_CRIT_FAILURE, "Unable to create check online req.\n");
+ be_ctx->check_online_retry_delay *= 2;
+ if (be_ctx->check_online_retry_delay > ONLINE_CB_RETRY_MAX_DELAY) {
+ be_ctx->check_online_retry_delay = ONLINE_CB_RETRY_MAX_DELAY;
+ }
+
+ schedule = tevent_timeval_current_ofs(be_ctx->check_online_retry_delay,
+ 0);
+ time_event = tevent_add_timer(be_ctx->ev, be_ctx, schedule,
+ check_if_online_delayed, be_ctx);
+
+ if (time_event == NULL) {
+ DEBUG(SSSDBG_OP_FAILURE, "Failed to schedule online check\n");
goto done;
}
+
+ DEBUG(SSSDBG_TRACE_INTERNAL,
+ "Schedule check_if_online_delayed in %ds.\n",
+ be_ctx->check_online_retry_delay);
return;
}
@@ -303,28 +348,23 @@ done:
}
}
-static void check_if_online(struct be_ctx *be_ctx)
+static void check_if_online(struct be_ctx *be_ctx, int delay)
{
- errno_t ret;
-
- be_run_unconditional_online_cb(be_ctx);
-
- if (!be_is_offline(be_ctx)) {
- DEBUG(SSSDBG_TRACE_INTERNAL,
- "Backend is already online, nothing to do.\n");
- return;
- }
+ struct tevent_timer *time_event;
+ struct timeval schedule;
/* Make sure nobody tries to go online while we are checking */
be_ctx->offstat.went_offline = time(NULL);
- DEBUG(SSSDBG_TRACE_INTERNAL, "Trying to go back online!\n");
-
be_ctx->check_online_ref_count++;
if (be_ctx->check_online_ref_count != 1) {
DEBUG(SSSDBG_TRACE_INTERNAL,
"There is an online check already running.\n");
+ /* Do not have more than ONLINE_CB_RETRY retries in the queue */
+ if (be_ctx->check_online_ref_count > ONLINE_CB_RETRY) {
+ be_ctx->check_online_ref_count--;
+ }
return;
}
@@ -334,12 +374,20 @@ static void check_if_online(struct be_ctx *be_ctx)
goto failed;
}
- ret = be_check_online_request(be_ctx);
- if (ret != EOK) {
- DEBUG(SSSDBG_CRIT_FAILURE, "Unable to create check online req.\n");
+ schedule = tevent_timeval_current_ofs(delay, 0);
+ time_event = tevent_add_timer(be_ctx->ev, be_ctx, schedule,
+ check_if_online_delayed, be_ctx);
+
+ if (time_event == NULL) {
+ DEBUG(SSSDBG_OP_FAILURE,
+ "Scheduling check_if_online_delayed failed.\n");
goto failed;
}
+ be_ctx->check_online_ref_count = ONLINE_CB_RETRY;
+ be_ctx->check_online_retry_delay = 1;
+ DEBUG(SSSDBG_TRACE_INTERNAL,
+ "Schedule check_if_online_delayed in %ds.\n", delay);
return;
failed:
@@ -373,7 +421,7 @@ static void signal_be_reset_offline(struct tevent_context *ev,
void *private_data)
{
struct be_ctx *ctx = talloc_get_type(private_data, struct be_ctx);
- check_if_online(ctx);
+ check_if_online(ctx, 0);
}
errno_t be_process_init(TALLOC_CTX *mem_ctx,
@@ -649,7 +697,7 @@ static int data_provider_res_init(struct sbus_request *dbus_req, void *data)
be_ctx = talloc_get_type(data, struct be_ctx);
resolv_reread_configuration(be_ctx->be_res->resolv);
- check_if_online(be_ctx);
+ check_if_online(be_ctx, 1);
return monitor_common_res_init(dbus_req, data);
}
@@ -666,7 +714,7 @@ static int data_provider_reset_offline(struct sbus_request *dbus_req, void *data
{
struct be_ctx *be_ctx;
be_ctx = talloc_get_type(data, struct be_ctx);
- check_if_online(be_ctx);
+ check_if_online(be_ctx, 1);
return sbus_request_return_and_finish(dbus_req, DBUS_TYPE_INVALID);
}
--
2.19.1