sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

finalize fetch lock changes to get rid of the record handle

Browse Source 
(This used to be ctdb commit 36c1e98a5533214d5507699dc5d8bdec35cb28c2)
This commit is contained in:
Ronnie sahlberg 2007-04-17 12:36:31 +10:00
parent e5fff3d611
commit 11b5345afc
4 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/common/ctdb_call.c
View File

@ -744,7 +744,7 @@ int ctdb_call(struct ctdb_db_context *ctdb_db, struct ctdb_call *call)
struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx,
int ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx,
TDB_DATA key, TDB_DATA *data)
{
struct ctdb_call call;
@ -775,10 +775,10 @@ struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALL
ret = ctdb_call_recv(state, &call);
if (ret != 0) {
talloc_free(rec);
return NULL;
return -6;
}
return rec;
return 0;
}

2
ctdb/include/ctdb.h
View File

@ -177,7 +177,7 @@ int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
dmaster for the record to be moved to the local node.
*/
struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, TDB_DATA key, TDB_DATA *data);
int ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, TDB_DATA key, TDB_DATA *data);
/*
do a fetch lock from a client to the local daemon

14
ctdb/include/ctdb_private.h
View File

@ -68,12 +68,6 @@ struct ctdb_node {
uint32_t vnn;
};
struct ctdb_record_handle {
struct ctdb_db_context *ctdb_db;
TDB_DATA key;
TDB_DATA *data;
};
/*
transport specific methods
*/
@ -200,6 +194,14 @@ struct ctdb_call_state {
};
/* used for fetch_lock */
struct ctdb_record_handle {
struct ctdb_db_context *ctdb_db;
TDB_DATA key;
TDB_DATA *data;
};
/*
operation IDs
*/

34
ctdb/tests/ctdb_fetch1.c
View File

@ -45,7 +45,6 @@ static void child_handler(struct ctdb_context *ctdb, uint32_t srvid,
void test1(struct ctdb_db_context *ctdb_db)
{
struct ctdb_record_handle *rh;
TDB_DATA key, data, data2, store_data;
int ret;
@ -55,13 +54,26 @@ void test1(struct ctdb_db_context *ctdb_db)
printf("Test1: write and verify we can read it back: ");
key.dptr = discard_const("Record");
key.dsize = strlen((const char *)key.dptr)+1;
rh = ctdb_fetch_lock(ctdb_db, ctdb_db, key, &data);
ret = ctdb_client_fetch_lock(ctdb_db, ctdb_db, key, &data);
if (ret!=0) {
printf("test1: ctdb_client_fetch_lock() failed\n");
exit(1);
}
store_data.dptr = discard_const("data to store");
store_data.dsize = strlen((const char *)store_data.dptr)+1;
ret = ctdb_client_store_unlock(rh, store_data);
ret = ctdb_client_store_unlock(ctdb_db, key, store_data);
if (ret!=0) {
printf("test1: ctdb_client_store_unlock() failed\n");
exit(1);
}
ret = ctdb_client_fetch_lock(ctdb_db, ctdb_db, key, &data2);
if (ret!=0) {
printf("test1: ctdb_client_fetch_lock() failed\n");
exit(1);
}
rh = ctdb_fetch_lock(ctdb_db, ctdb_db, key, &data2);
/* hopefully data2 will now contain the record written above */
if (!strcmp("data to store", (const char *)data2.dptr)) {
printf("SUCCESS\n");
@ -71,14 +83,18 @@ void test1(struct ctdb_db_context *ctdb_db)
}
/* just write it back to unlock it */
ret = ctdb_client_store_unlock(rh, store_data);
ret = ctdb_client_store_unlock(ctdb_db, key, store_data);
if (ret!=0) {
printf("test1: ctdb_client_store_unlock() failed\n");
exit(1);
}
}
void child(int srvid, struct event_context *ev, struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db)
{
TDB_DATA data;
struct ctdb_record_handle *rh;
TDB_DATA key, data2;
int ret;
data.dptr=discard_const("dummy message");
data.dsize=strlen((const char *)data.dptr)+1;
@ -94,7 +110,11 @@ void child(int srvid, struct event_context *ev, struct ctdb_context *ctdb, struc
/* fetch and lock the record */
key.dptr = discard_const("Record");
key.dsize = strlen((const char *)key.dptr)+1;
rh = ctdb_fetch_lock(ctdb_db, ctdb_db, key, &data2);
ret = ctdb_client_fetch_lock(ctdb_db, ctdb_db, key, &data2);
if (ret!=0) {
printf("client: ctdb_client_fetch_lock() failed\n");
exit(1);
}
ctdb_send_message(ctdb, ctdb_get_vnn(ctdb), PARENT_SRVID, data);