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

traverse: Ensure backward compatibility for CTDB_CONTROL_TRAVERSE_ALL

Browse Source 
This makes sure that CTDB_CONTROL TRAVERSE_ALL is compatible with older versions
of CTDB (i.e. 1.2.39 and 1.2.40 branches).

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>

(This used to be ctdb commit 5808f0778b39b79ab7a5c7f53ad27947131386ec)
This commit is contained in:
Amitay Isaacs 2013-04-11 13:20:09 +10:00 committed by Michael Adam
parent 9e0f8fa09c
commit ae5e2244ad
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ctdb/server/ctdb_traverse.c
View File

@ -285,6 +285,7 @@ static struct ctdb_traverse_all_handle *ctdb_daemon_traverse_all(struct ctdb_db_
int ret; int ret;
TDB_DATA data; TDB_DATA data;
struct ctdb_traverse_all r; struct ctdb_traverse_all r;
struct ctdb_traverse_all_ext r_ext;
uint32_t destination; uint32_t destination;
state = talloc(start_state, struct ctdb_traverse_all_handle); state = talloc(start_state, struct ctdb_traverse_all_handle);
@ -302,15 +303,26 @@ static struct ctdb_traverse_all_handle *ctdb_daemon_traverse_all(struct ctdb_db_
talloc_set_destructor(state, ctdb_traverse_all_destructor); talloc_set_destructor(state, ctdb_traverse_all_destructor);
if (start_state->withemptyrecords) {
r_ext.db_id = ctdb_db->db_id;
r_ext.reqid = state->reqid;
r_ext.pnn = ctdb->pnn;
r_ext.client_reqid = start_state->reqid;
r_ext.srvid = start_state->srvid;
r_ext.withemptyrecords = start_state->withemptyrecords;
data.dptr = (uint8_t *)&r_ext;
data.dsize = sizeof(r_ext);
} else {
r.db_id = ctdb_db->db_id; r.db_id = ctdb_db->db_id;
r.reqid = state->reqid; r.reqid = state->reqid;
r.pnn = ctdb->pnn; r.pnn = ctdb->pnn;
r.client_reqid = start_state->reqid; r.client_reqid = start_state->reqid;
r.srvid = start_state->srvid; r.srvid = start_state->srvid;
r.withemptyrecords = start_state->withemptyrecords;
data.dptr = (uint8_t *)&r; data.dptr = (uint8_t *)&r;
data.dsize = sizeof(r); data.dsize = sizeof(r);
}
if (ctdb_db->persistent == 0) { if (ctdb_db->persistent == 0) {
/* normal database, traverse all nodes */ /* normal database, traverse all nodes */
@ -339,9 +351,16 @@ static struct ctdb_traverse_all_handle *ctdb_daemon_traverse_all(struct ctdb_db_
* node, or if it is a persistent database, just tell the local * node, or if it is a persistent database, just tell the local
* node * node
*/ */
if (start_state->withemptyrecords) {
ret = ctdb_daemon_send_control(ctdb, destination, 0,
CTDB_CONTROL_TRAVERSE_ALL_EXT,
0, CTDB_CTRL_FLAG_NOREPLY, data, NULL, NULL);
} else {
ret = ctdb_daemon_send_control(ctdb, destination, 0, ret = ctdb_daemon_send_control(ctdb, destination, 0,
CTDB_CONTROL_TRAVERSE_ALL, CTDB_CONTROL_TRAVERSE_ALL,
0, CTDB_CTRL_FLAG_NOREPLY, data, NULL, NULL); 0, CTDB_CTRL_FLAG_NOREPLY, data, NULL, NULL);
}
if (ret != 0) { if (ret != 0) {
talloc_free(state); talloc_free(state);
@ -479,7 +498,7 @@ int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data, TDB_
state->ctdb = ctdb; state->ctdb = ctdb;
state->client_reqid = c->client_reqid; state->client_reqid = c->client_reqid;
state->srvid = c->srvid; state->srvid = c->srvid;
state->withemptyrecords = c->withemptyrecords; state->withemptyrecords = false;
state->h = ctdb_traverse_local(ctdb_db, traverse_all_callback, state); state->h = ctdb_traverse_local(ctdb_db, traverse_all_callback, state);
if (state->h == NULL) { if (state->h == NULL) {