Attachment 13802 Details for Bug 13152 – Patches for v4-6

[patch] Patches for v4-6

BZ13152-v4-6.patch (text/plain), 2.31 KB, created by Amitay Isaacs on 2017-11-22 04:32:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-11-22 04:32:18 UTC

Size: 2.31 KB

patch

obsolete

>From f04aa671a7561154552384dff355219c0ec4533d Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Thu, 19 Oct 2017 14:58:18 +1100
>Subject: [PATCH] ctdb-daemon: Allocate deferred calls off calling context
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13152
>
>This makes sure that if a client disconnects, all the deferred calls
>from the client are correctly freed.
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>(cherry picked from commit 848f2425984667c243ccac847b8f48a66ce10178)
>---
> ctdb/server/ctdb_call.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
>diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
>index b3bc9cf7476..a4f84a34a86 100644
>--- a/ctdb/server/ctdb_call.c
>+++ b/ctdb/server/ctdb_call.c
>@@ -1567,6 +1567,7 @@ struct revokechild_deferred_call {
> 	struct ctdb_req_header *hdr;
> 	deferred_requeue_fn fn;
> 	void *ctx;
>+	struct revokechild_handle *rc;
> };
> 
> struct revokechild_handle {
>@@ -1591,12 +1592,20 @@ static void deferred_call_requeue(struct tevent_context *ev,
> 	while (dlist != NULL) {
> 		struct revokechild_deferred_call *dcall = dlist;
> 
>+		talloc_set_destructor(dcall, NULL);
> 		DLIST_REMOVE(dlist, dcall);
> 		dcall->fn(dcall->ctx, dcall->hdr);
> 		talloc_free(dcall);
> 	}
> }
> 
>+static int deferred_call_destructor(struct revokechild_deferred_call *dcall)
>+{
>+	struct revokechild_handle *rc = dcall->rc;
>+
>+	DLIST_REMOVE(rc->deferred_call_list, dcall);
>+	return 0;
>+}
> 
> static int revokechild_destructor(struct revokechild_handle *rc)
> {
>@@ -1935,7 +1944,7 @@ int ctdb_add_revoke_deferred_call(struct ctdb_context *ctdb, struct ctdb_db_cont
> 		return -1;
> 	}
> 
>-	deferred_call = talloc(ctdb_db, struct revokechild_deferred_call);
>+	deferred_call = talloc(call_context, struct revokechild_deferred_call);
> 	if (deferred_call == NULL) {
> 		DEBUG(DEBUG_ERR,("Failed to allocate deferred call structure for revoking record\n"));
> 		return -1;
>@@ -1945,6 +1954,9 @@ int ctdb_add_revoke_deferred_call(struct ctdb_context *ctdb, struct ctdb_db_cont
> 	deferred_call->hdr  = talloc_steal(deferred_call, hdr);
> 	deferred_call->fn   = fn;
> 	deferred_call->ctx  = call_context;
>+	deferred_call->rc   = rc;
>+
>+	talloc_set_destructor(deferred_call, deferred_call_destructor);
> 
> 	DLIST_ADD(rc->deferred_call_list, deferred_call);
> 
>-- 
>2.13.6
>

Flags:

martins: review+

Actions: View

Attachments on bug 13152: 13802 | 13803