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

recoverd: basic_failback() can call find_takeover_node() directly

Browse Source 
Instead of unassigning, looping back and depending on
basic_allocate_unassigned.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 4dc08e37dec464c8785a2ddae15c7c69d3c81ac3)
This commit is contained in:
Martin Schwenke 2012-12-11 15:43:36 +11:00
parent 326328d520
commit dfa7ce7b73
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/server/ctdb_takeover.c
View File

@ -1683,12 +1683,10 @@ static bool basic_failback(struct ctdb_context *ctdb,
&& (*retries < (num_ips + 5)) ){
struct ctdb_public_ip_list *tmp;
/* mark one of maxnode's vnn's as unassigned and try
again
*/
/* Reassign one of maxnode's VNNs */
for (tmp=all_ips;tmp;tmp=tmp->next) {
if (tmp->pnn == maxnode) {
tmp->pnn = -1;
(void)find_takeover_node(ctdb, nodemap, mask, tmp, all_ips);
(*retries)++;
return true;
}