Blame SOURCES/0008-data-provider-run-offline-callbacks-only-once.patch

ca1eb8
From 2d350235bc960a91233d29b97c3a205bd2e04c08 Mon Sep 17 00:00:00 2001
ca1eb8
From: Sumit Bose <sbose@redhat.com>
ca1eb8
Date: Fri, 8 Jun 2018 18:42:28 +0200
ca1eb8
Subject: [PATCH] data provider: run offline callbacks only once
ca1eb8
ca1eb8
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
ca1eb8
(cherry picked from commit f28d995719db632130e9e063cb1ab7cb4e0fc8d8)
ca1eb8
---
ca1eb8
 src/providers/backend.h                 |  1 +
ca1eb8
 src/providers/data_provider_be.c        |  1 +
ca1eb8
 src/providers/data_provider_callbacks.c | 36 +++++++++++++++++++------
ca1eb8
 3 files changed, 30 insertions(+), 8 deletions(-)
ca1eb8
ca1eb8
diff --git a/src/providers/backend.h b/src/providers/backend.h
ca1eb8
index 1914274037ce7f7ff4b6d8486b041789a865fd59..6a34b91a911fc12163fa9448ea82ff93f5bf3849 100644
ca1eb8
--- a/src/providers/backend.h
ca1eb8
+++ b/src/providers/backend.h
ca1eb8
@@ -95,6 +95,7 @@ struct be_ctx {
ca1eb8
     struct be_cb *online_cb_list;
ca1eb8
     bool run_online_cb;
ca1eb8
     struct be_cb *offline_cb_list;
ca1eb8
+    bool run_offline_cb;
ca1eb8
     struct be_cb *reconnect_cb_list;
ca1eb8
     /* In contrast to online_cb_list which are only run if the backend is
ca1eb8
      * offline the unconditional_online_cb_list should be run whenever the
ca1eb8
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
ca1eb8
index e8cddd976bb164dc6d4655bf2ebe9a03c3d9d26a..fad6f280195b615d1de45afaf0c459bdf78c8c0a 100644
ca1eb8
--- a/src/providers/data_provider_be.c
ca1eb8
+++ b/src/providers/data_provider_be.c
ca1eb8
@@ -219,6 +219,7 @@ static void be_reset_offline(struct be_ctx *ctx)
ca1eb8
 {
ca1eb8
     ctx->offstat.went_offline = 0;
ca1eb8
     ctx->offstat.offline = false;
ca1eb8
+    ctx->run_offline_cb = true;
ca1eb8
 
ca1eb8
     reactivate_subdoms(ctx->domain);
ca1eb8
 
ca1eb8
diff --git a/src/providers/data_provider_callbacks.c b/src/providers/data_provider_callbacks.c
ca1eb8
index 436357e228c0e1a689aa18b8ef41a82f63774d3a..24e125ea5be70208d7cf2cb06a80c39207e29db4 100644
ca1eb8
--- a/src/providers/data_provider_callbacks.c
ca1eb8
+++ b/src/providers/data_provider_callbacks.c
ca1eb8
@@ -265,22 +265,42 @@ void be_run_unconditional_online_cb(struct be_ctx *be)
ca1eb8
 int be_add_offline_cb(TALLOC_CTX *mem_ctx, struct be_ctx *ctx, be_callback_t cb,
ca1eb8
                       void *pvt, struct be_cb **offline_cb)
ca1eb8
 {
ca1eb8
-    return be_add_cb(mem_ctx, ctx, cb, pvt, &ctx->offline_cb_list, offline_cb);
ca1eb8
+    int ret;
ca1eb8
+
ca1eb8
+    ret = be_add_cb(mem_ctx, ctx, cb, pvt, &ctx->offline_cb_list, offline_cb);
ca1eb8
+    if (ret != EOK) {
ca1eb8
+        DEBUG(SSSDBG_CRIT_FAILURE, "be_add_cb failed.\n");
ca1eb8
+        return ret;
ca1eb8
+    }
ca1eb8
+
ca1eb8
+    /* Make sure we run the callback when SSSD goes offline */
ca1eb8
+    ctx->run_offline_cb = true;
ca1eb8
+
ca1eb8
+    return EOK;
ca1eb8
 }
ca1eb8
 
ca1eb8
 void be_run_offline_cb(struct be_ctx *be) {
ca1eb8
     int ret;
ca1eb8
 
ca1eb8
-    if (be->offline_cb_list) {
ca1eb8
-        DEBUG(SSSDBG_MINOR_FAILURE, "Going offline. Running callbacks.\n");
ca1eb8
+    if (be->run_offline_cb) {
ca1eb8
+        /* Reset the flag, we only want to run these callbacks once when going
ca1eb8
+         * offline */
ca1eb8
+        be->run_offline_cb = false;
ca1eb8
 
ca1eb8
-        ret = be_run_cb(be, be->offline_cb_list);
ca1eb8
-        if (ret != EOK) {
ca1eb8
-            DEBUG(SSSDBG_CRIT_FAILURE, "be_run_cb failed.\n");
ca1eb8
+        if (be->offline_cb_list) {
ca1eb8
+            DEBUG(SSSDBG_MINOR_FAILURE, "Going offline. Running callbacks.\n");
ca1eb8
+
ca1eb8
+            ret = be_run_cb(be, be->offline_cb_list);
ca1eb8
+            if (ret != EOK) {
ca1eb8
+                DEBUG(SSSDBG_CRIT_FAILURE, "be_run_cb failed.\n");
ca1eb8
+            }
ca1eb8
+
ca1eb8
+        } else {
ca1eb8
+            DEBUG(SSSDBG_TRACE_ALL,
ca1eb8
+                  "Offline call back list is empty, nothing to do.\n");
ca1eb8
         }
ca1eb8
-
ca1eb8
     } else {
ca1eb8
         DEBUG(SSSDBG_TRACE_ALL,
ca1eb8
-              "Offline call back list is empty, nothing to do.\n");
ca1eb8
+              "Flag indicates that offline callback were already called.\n");
ca1eb8
     }
ca1eb8
 }
ca1eb8
-- 
ca1eb8
2.17.1
ca1eb8