sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-03 05:49:28 +03:00
Code Activity

s3: Use lock_order for setting the db priority

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Jan 18 16:21:52 CET 2012 on sn-devel-104
This commit is contained in:
Volker Lendecke
2012-01-16 13:42:52 +01:00
committed by Volker Lendecke
parent d2068d33a4
commit d2bf6af165
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1439,6 +1439,9 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
char *db_path; char *db_path;
struct ctdbd_connection *conn; struct ctdbd_connection *conn;
struct loadparm_context *lp_ctx; struct loadparm_context *lp_ctx;
struct ctdb_db_priority prio;
NTSTATUS status;
int cstatus;
if (!lp_clustering()) { if (!lp_clustering()) {
DEBUG(10, ("Clustering disabled -- no ctdb\n")); DEBUG(10, ("Clustering disabled -- no ctdb\n"));
@ -1485,6 +1488,21 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
chmod(db_path, mode); chmod(db_path, mode);
} }
prio.db_id = db_ctdb->db_id;
prio.priority = lock_order;
status = ctdbd_control_local(
conn, CTDB_CONTROL_SET_DB_PRIORITY, 0, 0,
make_tdb_data((uint8_t *)&prio, sizeof(prio)),
NULL, NULL, &cstatus);
if (!NT_STATUS_IS_OK(status) || (cstatus != 0)) {
DEBUG(1, ("CTDB_CONTROL_SET_DB_PRIORITY failed: %s, %d\n",
nt_errstr(status), cstatus));
TALLOC_FREE(result);
return NULL;
}
lp_ctx = loadparm_init_s3(db_path, loadparm_s3_context()); lp_ctx = loadparm_init_s3(db_path, loadparm_s3_context());
db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags,