r22082: merged the ctdb changes from bzr

added opendb ctdb backend from ronnie
(This used to be commit b0da25cb79f860bfa14ba7a8419c7996d936292b)

2 files changed, 8 insertions, 1 deletions

diff --git a/source4/cluster/ctdb/include/ctdb.h b/source4/cluster/ctdb/include/ctdb.h
index 51eeaebedb..9049314401 100644
--- a/source4/cluster/ctdb/include/ctdb.h
+++ b/source4/cluster/ctdb/include/ctdb.h
@@ -21,12 +21,14 @@
 #ifndef _CTDB_H
 #define _CTDB_H
 
+#define CTDB_IMMEDIATE_MIGRATION	0x00000001
 struct ctdb_call {
 	int call_id;
 	TDB_DATA key;
 	TDB_DATA call_data;
 	TDB_DATA reply_data;
 	uint32_t status;
+	uint32_t flags;
 };
 
 /*
@@ -148,6 +150,7 @@ int ctdb_set_message_handler(struct ctdb_context *ctdb, ctdb_message_fn_t handle
 int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
 		      uint32_t srvid, TDB_DATA data);
 
+
 /* 
    fetch and lock a ctdb record. Underneath this will force the
    dmaster for the record to be moved to the local node. 
@@ -155,7 +158,7 @@ int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
    The lock is released when is talloc_free() is called on the
    returned ctdb_record_handle. 
 */
-struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TDB_DATA key, TDB_DATA *data);
+struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, TDB_DATA key, TDB_DATA *data);
 
 /*
   change the data in a record held with a ctdb_record_handle
@@ -163,4 +166,5 @@ struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TDB_
  */
 int ctdb_record_store(struct ctdb_record_handle *rec, TDB_DATA data);
 
+
 #endif
diff --git a/source4/cluster/ctdb/include/ctdb_private.h b/source4/cluster/ctdb/include/ctdb_private.h
index 1e2244ff7d..66a9a6e244 100644
--- a/source4/cluster/ctdb/include/ctdb_private.h
+++ b/source4/cluster/ctdb/include/ctdb_private.h
@@ -23,6 +23,8 @@
 
 #include "ctdb.h"
 
+
+#define CTDB_FETCH_FUNC 0xf0000001
 /*
   an installed ctdb remote call
 */
@@ -166,6 +168,7 @@ struct ctdb_req_header {
 
 struct ctdb_req_call {
 	struct ctdb_req_header hdr;
+	uint32_t flags;
 	uint32_t db_id;
 	uint32_t callid;
 	uint32_t keylen;