diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-06-11 21:37:09 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-06-11 21:37:09 +1000 |
| commit | a31ece536cc4100fe638036a0b2f10b7dac71684 (patch) | |
| tree | 3d2f0aa6a24c01cf049537d7c697ce6f47b8adb4 | |
| parent | 8120da0e9d6b480d2a678778572d827c87d0a046 (diff) | |
| download | samba-a31ece536cc4100fe638036a0b2f10b7dac71684.tar.gz samba-a31ece536cc4100fe638036a0b2f10b7dac71684.tar.xz samba-a31ece536cc4100fe638036a0b2f10b7dac71684.zip | |
more detail in recovery message
(This used to be ctdb commit bc18a39efcf1fa5edfadc4c2f842f7cf035e4fbd)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 90b7997744..9522f64434 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1293,11 +1293,19 @@ again: active, then that is also a good reason to do recovery */ for (i=0;i<nodemap->num;i++) { - if ((remote_nodemap->nodes[i].vnn != nodemap->nodes[i].vnn) - || ((remote_nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE) != - (nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE))) { - DEBUG(0, (__location__ " Remote node:%u has different nodemap.\n", - nodemap->nodes[j].vnn)); + if (remote_nodemap->nodes[i].vnn != nodemap->nodes[i].vnn) { + DEBUG(0, (__location__ " Remote node:%u has different nodemap vnn for %d (%u vs %u).\n", + nodemap->nodes[j].vnn, i, + remote_nodemap->nodes[i].vnn, nodemap->nodes[i].vnn)); + do_recovery(rec, mem_ctx, vnn, num_active, nodemap, + vnnmap, nodemap->nodes[j].vnn); + goto again; + } + if ((remote_nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE) != + (nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE)) { + DEBUG(0, (__location__ " Remote node:%u has different nodemap flags for %d (0x%x vs 0x%x)\n", + nodemap->nodes[j].vnn, i, + remote_nodemap->nodes[i].flags, nodemap->nodes[i].flags)); do_recovery(rec, mem_ctx, vnn, num_active, nodemap, vnnmap, nodemap->nodes[j].vnn); goto again; |