summaryrefslogtreecommitdiffstats
path: root/ctdb/server
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-01-19 08:38:53 +0100
committerStefan Metzmacher <metze@samba.org>2010-01-20 09:44:35 +0100
commit2f36e78d88dc162ba1867d0fd6b49fbe4c82ee22 (patch)
tree3b6fe342405934199b39bbce5fe87617085c46ab /ctdb/server
parent35a15ad7a9ee482fc2b3fcf04eeadb5e4ffb6e52 (diff)
downloadsamba-2f36e78d88dc162ba1867d0fd6b49fbe4c82ee22.tar.gz
samba-2f36e78d88dc162ba1867d0fd6b49fbe4c82ee22.tar.xz
samba-2f36e78d88dc162ba1867d0fd6b49fbe4c82ee22.zip
server: add missing goto again after do_recovery()
metze (This used to be ctdb commit 898894d3acbcc0add2ab0706a3172a446622f687)
Diffstat (limited to 'ctdb/server')
-rw-r--r--ctdb/server/ctdb_recoverd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 4b407c38a4..1c3b213da7 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -3264,6 +3264,7 @@ again:
DEBUG(DEBUG_ERR, (__location__ " Unable to run the 'startrecovery' event on cluster\n"));
ctdb_set_culprit(rec, ctdb->pnn);
do_recovery(rec, mem_ctx, pnn, nodemap, vnnmap);
+ goto again;
}
ret = ctdb_takeover_run(ctdb, nodemap);
@@ -3271,6 +3272,7 @@ again:
DEBUG(DEBUG_ERR, (__location__ " Unable to setup public takeover addresses - starting recovery\n"));
ctdb_set_culprit(rec, ctdb->pnn);
do_recovery(rec, mem_ctx, pnn, nodemap, vnnmap);
+ goto again;
}
/* execute the "recovered" event script on all nodes */