From: Amitay Isaacs <amitay@gmail.com>
Date: Tue, 19 Jul 2016 07:31:21 +0000 (+1000)
Subject: dbwrap_ctdb: Remove setting of database priority from samba
X-Git-Tag: tdb-1.3.10~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ac9d0afa66;p=thirdparty%2Fsamba.git

dbwrap_ctdb: Remove setting of database priority from samba

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

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 3bbb9be0312..d86d0788f39 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1596,7 +1596,6 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 	struct db_ctdb_ctx *db_ctdb;
 	char *db_path;
 	struct loadparm_context *lp_ctx;
-	struct ctdb_db_priority prio;
 	int32_t cstatus;
 	int ret;
 
@@ -1645,21 +1644,6 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 	tdb_flags &= TDB_SEQNUM|TDB_VOLATILE|
 		TDB_MUTEX_LOCKING|TDB_CLEAR_IF_FIRST;
 
-	prio.db_id = db_ctdb->db_id;
-	prio.priority = lock_order;
-
-	ret = ctdbd_control_local(
-		db_ctdb->conn, CTDB_CONTROL_SET_DB_PRIORITY, 0, 0,
-		make_tdb_data((uint8_t *)&prio, sizeof(prio)),
-		NULL, NULL, &cstatus);
-
-	if ((ret != 0) || (cstatus != 0)) {
-		DEBUG(1, ("CTDB_CONTROL_SET_DB_PRIORITY failed: %s, "
-			  "%"PRIi32"\n", strerror(ret), cstatus));
-		TALLOC_FREE(result);
-		return NULL;
-	}
-
 	if (!result->persistent &&
 	    (dbwrap_flags & DBWRAP_FLAG_OPTIMIZE_READONLY_ACCESS))
 	{