ctdb-scripts: Do not de-duplicate the interfaces list
[samba.git] / source3 / lib / dbwrap / dbwrap_ctdb.c
index 6bdaab000a99a71b094d258eb542de80bf64ecdd..807b7f5224860d40028efe1db4a9cce46ea20780 100644 (file)
@@ -34,6 +34,7 @@
 #include "dbwrap/dbwrap_ctdb.h"
 #include "g_lock.h"
 #include "messages.h"
+#include "messages_ctdb.h"
 #include "lib/cluster_support.h"
 #include "lib/util/tevent_ntstatus.h"
 
@@ -50,7 +51,6 @@ struct db_ctdb_transaction_handle {
 
 struct db_ctdb_ctx {
        struct db_context *db;
-       struct ctdbd_connection *conn;
        struct tdb_wrap *wtdb;
        uint32_t db_id;
        struct db_ctdb_transaction_handle *transaction;
@@ -92,24 +92,24 @@ static int ctdb_async_ctx_init_internal(TALLOC_CTX *mem_ctx,
        }
 
        become_root();
-       ret = ctdbd_init_connection(mem_ctx,
-                                   lp_ctdbd_socket(),
-                                   lp_ctdb_timeout(),
-                                   &ctdb_async_ctx.async_conn);
+       ret = ctdbd_init_async_connection(
+               mem_ctx,
+               lp_ctdbd_socket(),
+               lp_ctdb_timeout(),
+               &ctdb_async_ctx.async_conn);
        unbecome_root();
 
-       if (ctdb_async_ctx.async_conn == NULL) {
-               DBG_ERR("ctdbd_init_connection failed\n");
-               return EIO;
-       }
-
-       ret = ctdbd_setup_fde(ctdb_async_ctx.async_conn, ev);
        if (ret != 0) {
-               DBG_ERR("ctdbd_setup_fde failed\n");
-               TALLOC_FREE(ctdb_async_ctx.async_conn);
+               DBG_ERR("ctdbd_init_async_connection(%s, timeout=%d) "
+                       "failed: ret=%d %s\n",
+                       lp_ctdbd_socket(),
+                       lp_ctdb_timeout(),
+                       ret, strerror(ret));
                return ret;
        }
 
+       SMB_ASSERT(ctdb_async_ctx.async_conn != NULL);
+
        ctdb_async_ctx.initialized = true;
        return 0;
 }
@@ -182,16 +182,16 @@ static NTSTATUS db_ctdb_ltdb_parse(
 static NTSTATUS db_ctdb_ltdb_store(struct db_ctdb_ctx *db,
                                   TDB_DATA key,
                                   struct ctdb_ltdb_header *header,
-                                  TDB_DATA data)
+                                  const TDB_DATA *dbufs, int num_dbufs)
 {
-       TDB_DATA recs[2];
+       TDB_DATA recs[num_dbufs+1];
        int ret;
 
        recs[0] = (TDB_DATA) { .dptr = (uint8_t *)header,
                               .dsize = sizeof(struct ctdb_ltdb_header) };
-       recs[1] = data;
+       memcpy(&recs[1], dbufs, sizeof(TDB_DATA) * num_dbufs);
 
-       ret = tdb_storev(db->wtdb->tdb, key, recs, 2, TDB_REPLACE);
+       ret = tdb_storev(db->wtdb->tdb, key, recs, num_dbufs + 1, TDB_REPLACE);
 
        return (ret == 0) ? NT_STATUS_OK
                          : tdb_error_to_ntstatus(db->wtdb->tdb);
@@ -328,7 +328,8 @@ static int db_ctdb_transaction_destructor(struct db_ctdb_transaction_handle *h)
 {
        NTSTATUS status;
 
-       status = g_lock_unlock(h->ctx->lock_ctx, h->lock_name);
+       status = g_lock_unlock(h->ctx->lock_ctx,
+                              string_term_tdb_data(h->lock_name));
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("g_lock_unlock failed for %s: %s\n", h->lock_name,
                          nt_errstr(status)));
@@ -380,8 +381,12 @@ static int db_ctdb_transaction_start(struct db_context *db)
        /*
         * Wait a day, i.e. forever...
         */
-       status = g_lock_lock(ctx->lock_ctx, h->lock_name, G_LOCK_WRITE,
-                            timeval_set(86400, 0));
+       status = g_lock_lock(ctx->lock_ctx,
+                            string_term_tdb_data(h->lock_name),
+                            G_LOCK_WRITE,
+                            tevent_timeval_set(86400, 0),
+                            NULL,
+                            NULL);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("g_lock_lock failed: %s\n", nt_errstr(status)));
                TALLOC_FREE(h);
@@ -494,7 +499,9 @@ static bool pull_newest_from_marshall_buffer(struct ctdb_marshall_buffer *buf,
        return true;
 }
 
-static NTSTATUS db_ctdb_store_transaction(struct db_record *rec, TDB_DATA data, int flag);
+static NTSTATUS db_ctdb_storev_transaction(struct db_record *rec,
+                                          const TDB_DATA *dbufs, int num_dbufs,
+                                          int flag);
 static NTSTATUS db_ctdb_delete_transaction(struct db_record *rec);
 
 static struct db_record *db_ctdb_fetch_locked_transaction(struct db_ctdb_ctx *ctx,
@@ -521,11 +528,17 @@ static struct db_record *db_ctdb_fetch_locked_transaction(struct db_ctdb_ctx *ct
                return NULL;
        }
 
-       result->store = db_ctdb_store_transaction;
+       result->storev = db_ctdb_storev_transaction;
        result->delete_rec = db_ctdb_delete_transaction;
 
+       if (ctx->transaction == NULL) {
+               DEBUG(0, ("no transaction available\n"));
+               TALLOC_FREE(result);
+               return NULL;
+       }
        if (pull_newest_from_marshall_buffer(ctx->transaction->m_write, key,
                                             NULL, result, &result->value)) {
+               result->value_valid = true;
                return result;
        }
 
@@ -533,6 +546,7 @@ static struct db_record *db_ctdb_fetch_locked_transaction(struct db_ctdb_ctx *ct
        if (ctdb_data.dptr == NULL) {
                /* create the record */
                result->value = tdb_null;
+               result->value_valid = true;
                return result;
        }
 
@@ -545,7 +559,9 @@ static struct db_record *db_ctdb_fetch_locked_transaction(struct db_ctdb_ctx *ct
                         result->value.dsize))) {
                DEBUG(0, ("talloc failed\n"));
                TALLOC_FREE(result);
+               return NULL;
        }
+       result->value_valid = true;
 
        SAFE_FREE(ctdb_data.dptr);
 
@@ -638,7 +654,7 @@ static NTSTATUS db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
                SAFE_FREE(rec.dptr);
        }
 
-       header.dmaster = ctdbd_vnn(h->ctx->conn);
+       header.dmaster = get_my_vnn();
        header.rsn++;
 
        h->m_write = db_ctdb_marshall_add(h, h->m_write, h->ctx->db_id, 0, key, &header, data);
@@ -656,13 +672,23 @@ static NTSTATUS db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
 /* 
    a record store inside a transaction
  */
-static NTSTATUS db_ctdb_store_transaction(struct db_record *rec, TDB_DATA data, int flag)
+static NTSTATUS db_ctdb_storev_transaction(
+       struct db_record *rec, const TDB_DATA *dbufs, int num_dbufs, int flag)
 {
        struct db_ctdb_transaction_handle *h = talloc_get_type_abort(
                rec->private_data, struct db_ctdb_transaction_handle);
        NTSTATUS status;
+       TDB_DATA data = {0};
+
+       status = dbwrap_merge_dbufs(&data, rec, dbufs, num_dbufs);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        status = db_ctdb_transaction_store(h, rec->key, data);
+
+       TALLOC_FREE(data.dptr);
+
        return status;
 }
 
@@ -727,14 +753,8 @@ static NTSTATUS db_ctdb_store_db_seqnum(struct db_ctdb_transaction_handle *h,
                                        uint64_t seqnum)
 {
        NTSTATUS status;
-       const char *keyname = CTDB_DB_SEQNUM_KEY;
-       TDB_DATA key;
-       TDB_DATA data;
-
-       key = string_term_tdb_data(keyname);
-
-       data.dptr = (uint8_t *)&seqnum;
-       data.dsize = sizeof(uint64_t);
+       TDB_DATA key = string_term_tdb_data(CTDB_DB_SEQNUM_KEY);
+       TDB_DATA data = { .dptr=(uint8_t *)&seqnum, .dsize=sizeof(seqnum) };
 
        status = db_ctdb_transaction_store(h, key, data);
 
@@ -809,7 +829,8 @@ static int db_ctdb_transaction_commit(struct db_context *db)
 
 again:
        /* tell ctdbd to commit to the other nodes */
-       ret = ctdbd_control_local(ctx->conn, CTDB_CONTROL_TRANS3_COMMIT,
+       ret = ctdbd_control_local(messaging_ctdb_connection(),
+                                 CTDB_CONTROL_TRANS3_COMMIT,
                                  h->ctx->db_id, 0,
                                  db_ctdb_marshall_finish(h->m_write),
                                  NULL, NULL, &status);
@@ -887,12 +908,16 @@ static int db_ctdb_transaction_cancel(struct db_context *db)
 }
 
 
-static NTSTATUS db_ctdb_store(struct db_record *rec, TDB_DATA data, int flag)
+static NTSTATUS db_ctdb_storev(struct db_record *rec,
+                              const TDB_DATA *dbufs, int num_dbufs, int flag)
 {
        struct db_ctdb_rec *crec = talloc_get_type_abort(
                rec->private_data, struct db_ctdb_rec);
+       NTSTATUS status;
 
-       return db_ctdb_ltdb_store(crec->ctdb_ctx, rec->key, &(crec->header), data);
+       status = db_ctdb_ltdb_store(crec->ctdb_ctx, rec->key, &(crec->header),
+                                   dbufs, num_dbufs);
+       return status;
 }
 
 
@@ -921,13 +946,13 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
        dd->keylen = rec->key.dsize;
        memcpy(dd->key, rec->key.dptr, rec->key.dsize);
 
-       ret = ctdbd_control_local(ctx->conn,
+       ret = ctdbd_control_local(messaging_ctdb_connection(),
                                  CTDB_CONTROL_SCHEDULE_FOR_DELETION,
                                  crec->ctdb_ctx->db_id,
                                  CTDB_CTRL_FLAG_NOREPLY, /* flags */
                                  indata,
+                                 NULL, /* mem_ctx */
                                  NULL, /* outdata */
-                                 NULL, /* errmsg */
                                  &cstatus);
        talloc_free(indata.dptr);
 
@@ -954,7 +979,7 @@ static NTSTATUS db_ctdb_delete(struct db_record *rec)
         * tdb-level cleanup
         */
 
-       status = db_ctdb_store(rec, tdb_null, 0);
+       status = db_ctdb_storev(rec, &tdb_null, 1, 0);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -1056,8 +1081,7 @@ static bool db_ctdb_can_use_local_copy(TDB_DATA ctdb_data, uint32_t my_vnn,
 
 static struct db_record *fetch_locked_internal(struct db_ctdb_ctx *ctx,
                                               TALLOC_CTX *mem_ctx,
-                                              TDB_DATA key,
-                                              bool tryonly)
+                                              TDB_DATA key)
 {
        struct db_record *result;
        struct db_ctdb_rec *crec;
@@ -1114,9 +1138,7 @@ again:
        }
 
        GetTimeOfDay(&chainlock_start);
-       lockret = tryonly
-               ? tdb_chainlock_nonblock(ctx->wtdb->tdb, key)
-               : tdb_chainlock(ctx->wtdb->tdb, key);
+       lockret = tdb_chainlock(ctx->wtdb->tdb, key);
        chainlock_time += timeval_elapsed(&chainlock_start);
 
        if (lockret != 0) {
@@ -1125,7 +1147,7 @@ again:
                return NULL;
        }
 
-       result->store = db_ctdb_store;
+       result->storev = db_ctdb_storev;
        result->delete_rec = db_ctdb_delete;
        talloc_set_destructor(result, db_ctdb_record_destr);
 
@@ -1136,18 +1158,11 @@ again:
         * take the shortcut and just return it.
         */
 
-       if (!db_ctdb_can_use_local_copy(ctdb_data, ctdbd_vnn(ctx->conn),
-                                       false)) {
+       if (!db_ctdb_can_use_local_copy(ctdb_data, get_my_vnn(), false)) {
                SAFE_FREE(ctdb_data.dptr);
                tdb_chainunlock(ctx->wtdb->tdb, key);
                talloc_set_destructor(result, NULL);
 
-               if (tryonly && (migrate_attempts != 0)) {
-                       DEBUG(5, ("record migrated away again\n"));
-                       TALLOC_FREE(result);
-                       return NULL;
-               }
-
                migrate_attempts += 1;
 
                DEBUG(10, ("ctdb_data.dptr = %p, dmaster = %"PRIu32" "
@@ -1155,12 +1170,13 @@ again:
                           ctdb_data.dptr, ctdb_data.dptr ?
                           ((struct ctdb_ltdb_header *)ctdb_data.dptr)->dmaster :
                           UINT32_MAX,
-                          ctdbd_vnn(ctx->conn),
+                          get_my_vnn(),
                           ctdb_data.dptr ?
                           ((struct ctdb_ltdb_header *)ctdb_data.dptr)->flags : 0));
 
                GetTimeOfDay(&ctdb_start_time);
-               ret = ctdbd_migrate(ctx->conn, ctx->db_id, key);
+               ret = ctdbd_migrate(messaging_ctdb_connection(), ctx->db_id,
+                                   key);
                ctdb_time += timeval_elapsed(&ctdb_start_time);
 
                if (ret != 0) {
@@ -1214,13 +1230,17 @@ again:
        result->value.dsize = ctdb_data.dsize - sizeof(crec->header);
        result->value.dptr = NULL;
 
-       if ((result->value.dsize != 0)
-           && !(result->value.dptr = (uint8_t *)talloc_memdup(
-                        result, ctdb_data.dptr + sizeof(crec->header),
-                        result->value.dsize))) {
-               DEBUG(0, ("talloc failed\n"));
-               TALLOC_FREE(result);
+       if (result->value.dsize != 0) {
+               result->value.dptr = talloc_memdup(
+                       result, ctdb_data.dptr + sizeof(crec->header),
+                       result->value.dsize);
+               if (result->value.dptr == NULL) {
+                       DBG_ERR("talloc failed\n");
+                       TALLOC_FREE(result);
+                       return NULL;
+               }
        }
+       result->value_valid = true;
 
        SAFE_FREE(ctdb_data.dptr);
 
@@ -1242,25 +1262,7 @@ static struct db_record *db_ctdb_fetch_locked(struct db_context *db,
                return db_ctdb_fetch_locked_persistent(ctx, mem_ctx, key);
        }
 
-       return fetch_locked_internal(ctx, mem_ctx, key, false);
-}
-
-static struct db_record *db_ctdb_try_fetch_locked(struct db_context *db,
-                                                 TALLOC_CTX *mem_ctx,
-                                                 TDB_DATA key)
-{
-       struct db_ctdb_ctx *ctx = talloc_get_type_abort(db->private_data,
-                                                       struct db_ctdb_ctx);
-
-       if (ctx->transaction != NULL) {
-               return db_ctdb_fetch_locked_transaction(ctx, mem_ctx, key);
-       }
-
-       if (db->persistent) {
-               return db_ctdb_fetch_locked_persistent(ctx, mem_ctx, key);
-       }
-
-       return fetch_locked_internal(ctx, mem_ctx, key, true);
+       return fetch_locked_internal(ctx, mem_ctx, key);
 }
 
 struct db_ctdb_parse_record_state {
@@ -1380,7 +1382,7 @@ static NTSTATUS db_ctdb_parse_record(struct db_context *db, TDB_DATA key,
 
        state.parser = parser;
        state.private_data = private_data;
-       state.my_vnn = ctdbd_vnn(ctx->conn);
+       state.my_vnn = get_my_vnn();
        state.empty_record = false;
 
        status = db_ctdb_try_parse_local_record(ctx, key, &state);
@@ -1388,7 +1390,7 @@ static NTSTATUS db_ctdb_parse_record(struct db_context *db, TDB_DATA key,
                return status;
        }
 
-       ret = ctdbd_parse(ctx->conn, ctx->db_id, key,
+       ret = ctdbd_parse(messaging_ctdb_connection(), ctx->db_id, key,
                          state.ask_for_readonly_copy, parser, private_data);
        if (ret != 0) {
                if (ret == ENOENT) {
@@ -1437,7 +1439,7 @@ static struct tevent_req *db_ctdb_parse_record_send(
        *state = (struct db_ctdb_parse_record_state) {
                .parser = parser,
                .private_data = private_data,
-               .my_vnn = ctdbd_vnn(ctx->conn),
+               .my_vnn = get_my_vnn(),
                .empty_record = false,
        };
 
@@ -1512,12 +1514,20 @@ struct traverse_state {
 static void traverse_callback(TDB_DATA key, TDB_DATA data, void *private_data)
 {
        struct traverse_state *state = (struct traverse_state *)private_data;
-       struct db_record *rec;
-       TALLOC_CTX *tmp_ctx = talloc_new(state->db);
+       struct db_record *rec = NULL;
+       TALLOC_CTX *tmp_ctx = NULL;
+
+       tmp_ctx = talloc_new(state->db);
+       if (tmp_ctx == NULL) {
+               DBG_ERR("talloc_new failed\n");
+               return;
+       }
+
        /* we have to give them a locked record to prevent races */
        rec = db_ctdb_fetch_locked(state->db, tmp_ctx, key);
-       if (rec && rec->value.dsize > 0) {
+       if (rec != NULL && rec->value.dsize > 0) {
                state->fn(rec, state->private_data);
+               state->count++;
        }
        talloc_free(tmp_ctx);
 }
@@ -1598,10 +1608,11 @@ static int db_ctdb_traverse(struct db_context *db,
                                                         struct db_ctdb_ctx);
        struct traverse_state state;
 
-       state.db = db;
-       state.fn = fn;
-       state.private_data = private_data;
-       state.count = 0;
+       state = (struct traverse_state) {
+               .db = db,
+               .fn = fn,
+               .private_data = private_data,
+       };
 
        if (db->persistent) {
                struct tdb_context *ltdb = ctx->wtdb->tdb;
@@ -1658,7 +1669,8 @@ static int db_ctdb_traverse(struct db_context *db,
        return state.count;
 }
 
-static NTSTATUS db_ctdb_store_deny(struct db_record *rec, TDB_DATA data, int flag)
+static NTSTATUS db_ctdb_storev_deny(struct db_record *rec,
+                                   const TDB_DATA *dbufs, int num_dbufs, int flag)
 {
        return NT_STATUS_MEDIA_WRITE_PROTECTED;
 }
@@ -1677,9 +1689,10 @@ static void traverse_read_callback(TDB_DATA key, TDB_DATA data, void *private_da
        rec.db = state->db;
        rec.key = key;
        rec.value = data;
-       rec.store = db_ctdb_store_deny;
+       rec.storev = db_ctdb_storev_deny;
        rec.delete_rec = db_ctdb_delete_deny;
        rec.private_data = NULL;
+       rec.value_valid = true;
        state->fn(&rec, state->private_data);
        state->count++;
 }
@@ -1704,7 +1717,8 @@ static int traverse_persistent_callback_read(TDB_CONTEXT *tdb, TDB_DATA kbuf, TD
        rec.db = state->db;
        rec.key = kbuf;
        rec.value = dbuf;
-       rec.store = db_ctdb_store_deny;
+       rec.value_valid = true;
+       rec.storev = db_ctdb_storev_deny;
        rec.delete_rec = db_ctdb_delete_deny;
        rec.private_data = NULL;
 
@@ -1729,15 +1743,24 @@ static int db_ctdb_traverse_read(struct db_context *db,
                                                         struct db_ctdb_ctx);
        struct traverse_state state;
 
-       state.db = db;
-       state.fn = fn;
-       state.private_data = private_data;
-       state.count = 0;
+       state = (struct traverse_state) {
+               .db = db,
+               .fn = fn,
+               .private_data = private_data,
+       };
 
        if (db->persistent) {
                /* for persistent databases we don't need to do a ctdb traverse,
                   we can do a faster local traverse */
-               return tdb_traverse_read(ctx->wtdb->tdb, traverse_persistent_callback_read, &state);
+               int nrecs;
+
+               nrecs = tdb_traverse_read(ctx->wtdb->tdb,
+                                         traverse_persistent_callback_read,
+                                         &state);
+               if (nrecs == -1) {
+                       return -1;
+               }
+               return state.count;
        }
 
        ret = db_ctdbd_traverse(ctx->db_id, traverse_read_callback, &state);
@@ -1768,7 +1791,6 @@ static size_t db_ctdb_id(struct db_context *db, uint8_t *id, size_t idlen)
 
 struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                                struct messaging_context *msg_ctx,
-                               struct ctdbd_connection *conn,
                                const char *name,
                                int hash_size, int tdb_flags,
                                int open_flags, mode_t mode,
@@ -1780,7 +1802,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
        char *db_path;
        struct loadparm_context *lp_ctx;
        TDB_DATA data;
-       bool persistent = (tdb_flags & TDB_CLEAR_IF_FIRST);
+       TDB_DATA outdata = {0};
+       bool persistent = (tdb_flags & TDB_CLEAR_IF_FIRST) == 0;
        int32_t cstatus;
        int ret;
 
@@ -1810,9 +1833,9 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 
        db_ctdb->transaction = NULL;
        db_ctdb->db = result;
-       db_ctdb->conn = conn;
 
-       ret = ctdbd_db_attach(db_ctdb->conn, name, &db_ctdb->db_id, persistent);
+       ret = ctdbd_db_attach(messaging_ctdb_connection(), name,
+                             &db_ctdb->db_id, persistent);
        if (ret != 0) {
                DEBUG(0, ("ctdbd_db_attach failed for %s: %s\n", name,
                          strerror(ret)));
@@ -1824,7 +1847,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                data.dptr = (uint8_t *)&db_ctdb->db_id;
                data.dsize = sizeof(db_ctdb->db_id);
 
-               ret = ctdbd_control_local(conn, CTDB_CONTROL_ENABLE_SEQNUM,
+               ret = ctdbd_control_local(messaging_ctdb_connection(),
+                                         CTDB_CONTROL_ENABLE_SEQNUM,
                                          0, 0, data,
                                          NULL, NULL, &cstatus);
                if ((ret != 0) || cstatus != 0) {
@@ -1835,7 +1859,13 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                }
        }
 
-       db_path = ctdbd_dbpath(db_ctdb->conn, db_ctdb, db_ctdb->db_id);
+       db_path = ctdbd_dbpath(messaging_ctdb_connection(), db_ctdb,
+                              db_ctdb->db_id);
+       if (db_path == NULL) {
+               DBG_ERR("ctdbd_dbpath failed\n");
+               TALLOC_FREE(result);
+               return NULL;
+       }
 
        result->persistent = persistent;
        result->lock_order = lock_order;
@@ -1843,8 +1873,9 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
        data.dptr = (uint8_t *)&db_ctdb->db_id;
        data.dsize = sizeof(db_ctdb->db_id);
 
-       ret = ctdbd_control_local(conn, CTDB_CONTROL_DB_OPEN_FLAGS,
-                                 0, 0, data, NULL, &data, &cstatus);
+       ret = ctdbd_control_local(messaging_ctdb_connection(),
+                                 CTDB_CONTROL_DB_OPEN_FLAGS,
+                                 0, 0, data, NULL, &outdata, &cstatus);
        if (ret != 0) {
                DBG_ERR(" ctdb control for db_open_flags "
                         "failed: %s\n", strerror(ret));
@@ -1852,13 +1883,15 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       if (cstatus != 0 || data.dsize != sizeof(int)) {
+       if (cstatus != 0 || outdata.dsize != sizeof(int)) {
                DBG_ERR("ctdb_control for db_open_flags failed\n");
+               TALLOC_FREE(outdata.dptr);
                TALLOC_FREE(result);
                return NULL;
        }
 
-       tdb_flags = *(int *)data.dptr;
+       tdb_flags = *(int *)outdata.dptr;
+       TALLOC_FREE(outdata.dptr);
 
        if (!result->persistent) {
                ret = ctdb_async_ctx_init(NULL, messaging_tevent_context(msg_ctx));
@@ -1878,7 +1911,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                                       sizeof(db_ctdb->db_id));
 
                ret = ctdbd_control_local(
-                       db_ctdb->conn, CTDB_CONTROL_SET_DB_READONLY, 0, 0,
+                       messaging_ctdb_connection(),
+                       CTDB_CONTROL_SET_DB_READONLY, 0, 0,
                        indata, NULL, NULL, &cstatus);
                if ((ret != 0) || (cstatus != 0)) {
                        DEBUG(1, ("CTDB_CONTROL_SET_DB_READONLY failed: "
@@ -1937,7 +1971,6 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 
        result->private_data = (void *)db_ctdb;
        result->fetch_locked = db_ctdb_fetch_locked;
-       result->try_fetch_locked = db_ctdb_try_fetch_locked;
        result->parse_record = db_ctdb_parse_record;
        result->parse_record_send = db_ctdb_parse_record_send;
        result->parse_record_recv = db_ctdb_parse_record_recv;