sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-24 21:49:29 +03:00
Code Activity

break the code that repoints dmaster for all local and remote records

Browse Source 
into a separate helper function

(This used to be ctdb commit d5ab30d0ac21e736eb34eaa19bccfee5f0ce7cfb)
This commit is contained in:
Ronnie Sahlberg
2007-05-06 10:22:13 +10:00
parent d51a19f2ba
commit 9281cb192c
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ctdb/direct/recoverd.c
View File

@ -210,6 +210,28 @@ static int pull_all_remote_databases(struct ctdb_context *ctdb, struct ctdb_node
static int update_dmaster_on_all_databases(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap, uint32_t vnn, struct ctdb_dbid_map *dbmap, TALLOC_CTX *mem_ctx)
{
int i, j, ret;
/* update dmaster to point to this node for all databases/nodes */
for (i=0;i<dbmap->num;i++) {
for (j=0; j<nodemap->num; j++) {
/* dont repoint nodes that are unavailable */
if (!(nodemap->nodes[j].flags&NODE_FLAGS_CONNECTED)) {
continue;
}
ret = ctdb_ctrl_setdmaster(ctdb, timeval_current_ofs(1, 0), nodemap->nodes[j].vnn, ctdb, dbmap->dbids[i], vnn);
if (ret != 0) {
printf("Unable to set dmaster for node %u db:0x%08x\n", nodemap->nodes[j].vnn, dbmap->dbids[i]);
return -1;
}
}
}
return 0;
}
static int do_recovery(struct ctdb_context *ctdb, struct event_context *ev, static int do_recovery(struct ctdb_context *ctdb, struct event_context *ev,
TALLOC_CTX *mem_ctx, uint32_t vnn, uint32_t num_active, TALLOC_CTX *mem_ctx, uint32_t vnn, uint32_t num_active,
struct ctdb_node_map *nodemap, struct ctdb_vnn_map *vnnmap) struct ctdb_node_map *nodemap, struct ctdb_vnn_map *vnnmap)
@ -295,22 +317,18 @@ static int do_recovery(struct ctdb_context *ctdb, struct event_context *ev,
/* update dmaster to point to this node for all databases/nodes */ /* repoint all local and remote database records to the local
for (i=0;i<dbmap->num;i++) { node as being dmaster
for (j=0; j<nodemap->num; j++) { */
/* dont repoint nodes that are unavailable */ ret = update_dmaster_on_all_databases(ctdb, nodemap, vnn, dbmap, mem_ctx);
if (!(nodemap->nodes[j].flags&NODE_FLAGS_CONNECTED)) { if (ret != 0) {
continue; printf("Unable to update dmaster on all databases\n");
} return -1;
ret = ctdb_ctrl_setdmaster(ctdb, timeval_current_ofs(1, 0), nodemap->nodes[j].vnn, ctdb, dbmap->dbids[i], vnn);
if (ret != 0) {
printf("Unable to set dmaster for node %u db:0x%08x\n", nodemap->nodes[j].vnn, dbmap->dbids[i]);
return -1;
}
}
} }
/* push all records out to the nodes again */ /* push all records out to the nodes again */
for (i=0;i<dbmap->num;i++) { for (i=0;i<dbmap->num;i++) {
for (j=0; j<nodemap->num; j++) { for (j=0; j<nodemap->num; j++) {