sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

ctdbd_conn: pass persistent bool instead of tdb_flags

Browse Source 
ctdbd_db_attach() only needs to know the ctdb database model, not the
rest of the flags.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12891

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Ralph Boehme 2017-07-11 20:41:43 +02:00
parent 0077296cee
commit b2b7e3b971
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/ctdbd_conn.h
View File

@ -55,7 +55,7 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn,
TALLOC_CTX *mem_ctx, uint32_t db_id); TALLOC_CTX *mem_ctx, uint32_t db_id);
int ctdbd_db_attach(struct ctdbd_connection *conn, const char *name, int ctdbd_db_attach(struct ctdbd_connection *conn, const char *name,
uint32_t *db_id, int tdb_flags); uint32_t *db_id, bool persistent);
int 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);

3
source3/lib/ctdbd_conn.c
View File

@ -819,12 +819,11 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn,
* attach to a ctdb database * attach to a ctdb database
*/ */
int ctdbd_db_attach(struct ctdbd_connection *conn, int ctdbd_db_attach(struct ctdbd_connection *conn,
const char *name, uint32_t *db_id, int tdb_flags) const char *name, uint32_t *db_id, bool persistent)
{ {
int ret; int ret;
TDB_DATA data; TDB_DATA data;
int32_t cstatus; int32_t cstatus;
bool persistent = (tdb_flags & TDB_CLEAR_IF_FIRST) == 0;
data = string_term_tdb_data(name); data = string_term_tdb_data(name);

5
source3/lib/dbwrap/dbwrap_ctdb.c
View File

@ -1780,6 +1780,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
char *db_path; char *db_path;
struct loadparm_context *lp_ctx; struct loadparm_context *lp_ctx;
TDB_DATA data; TDB_DATA data;
bool persistent = (tdb_flags & TDB_CLEAR_IF_FIRST);
int32_t cstatus; int32_t cstatus;
int ret; int ret;
@ -1811,7 +1812,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
db_ctdb->db = result; db_ctdb->db = result;
db_ctdb->conn = conn; db_ctdb->conn = conn;
ret = ctdbd_db_attach(db_ctdb->conn, name, &db_ctdb->db_id, tdb_flags); ret = ctdbd_db_attach(db_ctdb->conn, name, &db_ctdb->db_id, persistent);
if (ret != 0) { if (ret != 0) {
DEBUG(0, ("ctdbd_db_attach failed for %s: %s\n", name, DEBUG(0, ("ctdbd_db_attach failed for %s: %s\n", name,
strerror(ret))); strerror(ret)));
@ -1836,7 +1837,7 @@ 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(db_ctdb->conn, db_ctdb, db_ctdb->db_id);
result->persistent = ((tdb_flags & TDB_CLEAR_IF_FIRST) == 0); result->persistent = persistent;
result->lock_order = lock_order; result->lock_order = lock_order;
/* only pass through specific flags */ /* only pass through specific flags */