From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 16 Jun 2016 06:34:39 +0000 (+1000)
Subject: ctdb-client: Fix implementation of delete_record
X-Git-Tag: tdb-1.3.10~513
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0e331b70459c2de198894c7b591a03d014ae88b;p=thirdparty%2Fsamba.git

ctdb-client: Fix implementation of delete_record

In delete_record, sync call to ctdb_ctrl_schedule_for_deletion will
cause nested event loops.  Instead wrap the async version.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 1f82bb2b958..ca3fd1961da 100644
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -1132,42 +1132,28 @@ bool ctdb_delete_record_recv(struct tevent_req *req, int *perr)
 
 int ctdb_delete_record(struct ctdb_record_handle *h)
 {
-	TDB_DATA rec;
-	struct ctdb_key_data key;
+	struct tevent_context *ev = h->ev;
+	TALLOC_CTX *mem_ctx;
+	struct tevent_req *req;
 	int ret;
+	bool status;
 
-	/* Cannot delete the record if it was obtained as a readonly copy */
-	if (h->readonly) {
-		return EINVAL;
-	}
-
-	rec.dsize = ctdb_ltdb_header_len(&h->header);
-	rec.dptr = talloc_size(h, rec.dsize);
-	if (rec.dptr == NULL) {
+	mem_ctx = talloc_new(NULL);
+	if (mem_ctx == NULL) {
 		return ENOMEM;
 	}
 
-	ctdb_ltdb_header_push(&h->header, rec.dptr);
-
-	ret = tdb_store(h->db->ltdb->tdb, h->key, rec, TDB_REPLACE);
-	talloc_free(rec.dptr);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR, ("Failed to delete record in DB %s\n",
-				  h->db->db_name));
-		return EIO;
+	req = ctdb_delete_record_send(mem_ctx, ev, h);
+	if (req == NULL) {
+		talloc_free(mem_ctx);
+		return ENOMEM;
 	}
 
-	key.db_id = h->db->db_id;
-	key.header = h->header;
-	key.key = h->key;
+	tevent_req_poll(req, ev);
 
-	ret = ctdb_ctrl_schedule_for_deletion(h, h->ev, h->client,
-					      h->client->pnn,
-					      tevent_timeval_zero(), &key);
-	if (ret != 0) {
-		DEBUG(DEBUG_WARNING,
-		      ("Failed to mark record to be deleted in DB %s\n",
-		       h->db->db_name));
+	status = ctdb_delete_record_recv(req, &ret);
+	talloc_free(mem_ctx);
+	if (! status) {
 		return ret;
 	}