From 4636912985e47f0562524b33ba457e5e4d33a0b9 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 2 Oct 2015 20:42:05 -0700 Subject: [PATCH] lib: Make ctdbd_migrate return 0/errno Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/include/ctdbd_conn.h | 3 +-- source3/lib/ctdbd_conn.c | 9 ++------- source3/lib/dbwrap/dbwrap_ctdb.c | 9 +++++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h index 7e56a4c6d60..6ebd4516718 100644 --- a/source3/include/ctdbd_conn.h +++ b/source3/include/ctdbd_conn.h @@ -54,8 +54,7 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn, int ctdbd_db_attach(struct ctdbd_connection *conn, const char *name, uint32_t *db_id, int tdb_flags); -NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, - TDB_DATA key); +int ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key); NTSTATUS ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, bool local_copy, diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index d759be6fffd..899d616cb8c 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -919,14 +919,12 @@ int ctdbd_db_attach(struct ctdbd_connection *conn, /* * force the migration of a record to this node */ -NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, - TDB_DATA key) +int ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key) { struct ctdb_req_call req; struct ctdb_req_header *hdr; struct iovec iov[2]; ssize_t nwritten; - NTSTATUS status; int ret; ZERO_STRUCT(req); @@ -958,21 +956,18 @@ NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, ret = ctdb_read_req(conn, req.hdr.reqid, NULL, &hdr); if (ret != 0) { DEBUG(10, ("ctdb_read_req failed: %s\n", strerror(ret))); - status = map_nt_error_from_unix(ret); goto fail; } if (hdr->operation != CTDB_REPLY_CALL) { DEBUG(0, ("received invalid reply\n")); - status = NT_STATUS_INTERNAL_ERROR; goto fail; } - status = NT_STATUS_OK; fail: TALLOC_FREE(hdr); - return status; + return ret; } /* diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index c495c5ca911..57afc855803 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1019,6 +1019,7 @@ static struct db_record *fetch_locked_internal(struct db_ctdb_ctx *ctx, double ctdb_time = 0; int duration_msecs; int lockret; + int ret; if (!(result = talloc(mem_ctx, struct db_record))) { DEBUG(0, ("talloc failed\n")); @@ -1105,13 +1106,13 @@ again: ((struct ctdb_ltdb_header *)ctdb_data.dptr)->flags : 0)); GetTimeOfDay(&ctdb_start_time); - status = ctdbd_migrate(messaging_ctdbd_connection(), ctx->db_id, - key); + ret = ctdbd_migrate(messaging_ctdbd_connection(), ctx->db_id, + key); ctdb_time += timeval_elapsed(&ctdb_start_time); - if (!NT_STATUS_IS_OK(status)) { + if (ret != 0) { DEBUG(5, ("ctdb_migrate failed: %s\n", - nt_errstr(status))); + strerror(ret))); TALLOC_FREE(result); return NULL; } -- 2.11.4.GIT