Rev 532: more detail in recovery message in http://samba.org/~tridge/ctdb

[tridge]

------------------------------------------------------------
revno: 532
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Mon 2007-06-11 21:37:09 +1000
message:
  more detail in recovery message
modified:
  server/ctdb_recoverd.c         recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c    2007-06-09 11:58:50 +0000
+++ b/server/ctdb_recoverd.c    2007-06-11 11:37:09 +0000
@@ -1293,11 +1293,19 @@
                   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;