sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

persistent: add a client context to the persistent_stat and track the db_id

Browse Source 
The db_id is tracked in the client context as an indication that a
transaction commit is in progress. This is cleared in the persistent_state
talloc destructor.

This is in order to properly treat running trans3_commits if the client
disconnects.

(This used to be ctdb commit e886ff24f4e3e250944289db95916b948893d26c)
This commit is contained in:
Michael Adam 2011-02-23 17:35:27 +01:00
parent 65f7a44987
commit 0b3d8d28f6
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ctdb/server/ctdb_persistent.c
View File

@ -29,6 +29,7 @@
struct ctdb_persistent_state {
struct ctdb_context *ctdb;
struct ctdb_db_context *ctdb_db; /* used by trans3_commit */
struct ctdb_client *client; /* used by trans3_commit */
struct ctdb_req_control *c;
const char *errormsg;
uint32_t num_pending;
@ -277,6 +278,10 @@ int32_t ctdb_control_trans2_commit(struct ctdb_context *ctdb,
static int ctdb_persistent_state_destructor(struct ctdb_persistent_state *state)
{
if (state->client != NULL) {
state->client->db_id = 0;
}
if (state->ctdb_db != NULL) {
state->ctdb_db->persistent_state = NULL;
}
@ -303,6 +308,21 @@ int32_t ctdb_control_trans3_commit(struct ctdb_context *ctdb,
return -1;
}
client = ctdb_reqid_find(ctdb, c->client_id, struct ctdb_client);
if (client == NULL) {
DEBUG(DEBUG_ERR,(__location__ " can not match persistent_store "
"to a client. Returning error\n"));
return -1;
}
if (client->db_id != 0) {
DEBUG(DEBUG_ERR,(__location__ " ERROR: trans3_commit: "
"client-db_id[0x%08x] != 0 "
"(client_id[0x%08x]): trans3_commit active?\n",
client->db_id, client->client_id));
return -1;
}
ctdb_db = find_ctdb_db(ctdb, m->db_id);
if (ctdb_db == NULL) {
DEBUG(DEBUG_ERR,(__location__ " ctdb_control_trans3_commit: "
@ -318,21 +338,18 @@ int32_t ctdb_control_trans3_commit(struct ctdb_context *ctdb,
return -1;
}
client = ctdb_reqid_find(ctdb, c->client_id, struct ctdb_client);
if (client == NULL) {
DEBUG(DEBUG_ERR,(__location__ " can not match persistent_store "
"to a client. Returning error\n"));
return -1;
}
ctdb_db->persistent_state = talloc_zero(ctdb_db,
struct ctdb_persistent_state);
CTDB_NO_MEMORY(ctdb, ctdb_db->persistent_state);
client->db_id = m->db_id;
state = ctdb_db->persistent_state;
state->ctdb = ctdb;
state->ctdb_db = ctdb_db;
state->c = c;
state->client = client;
talloc_set_destructor(state, ctdb_persistent_state_destructor);
for (i = 0; i < ctdb->vnn_map->size; i++) {