Rev 367: rename ctdb_control utility to ctdb in http://samba.org/~tridge/ctdb

[tridge]

------------------------------------------------------------
revno: 367
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Tue 2007-05-29 10:59:12 +1000
message:
  rename ctdb_control utility to ctdb
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  takeover/ctdb_takeover.c       
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
=== modified file 'Makefile.in'
--- a/Makefile.in       2007-05-27 20:48:18 +0000
+++ b/Makefile.in       2007-05-29 00:59:12 +0000
@@ -68,7 +68,7 @@
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ direct/ctdbd.o $(OBJS) $(LIB_FLAGS)
 
-bin/ctdb_control: $(OBJS) tools/ctdb_control.o 
+bin/ctdb: $(OBJS) tools/ctdb_control.o 
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ tools/ctdb_control.o $(OBJS) $(LIB_FLAGS)
 

=== modified file 'takeover/ctdb_takeover.c'
--- a/takeover/ctdb_takeover.c  2007-05-27 14:51:10 +0000
+++ b/takeover/ctdb_takeover.c  2007-05-29 00:59:12 +0000
@@ -252,14 +252,17 @@
                        for (j=(i+1)%nodemap->num;
                             j != i;
                             j=(j+1)%nodemap->num) {
-                               if (nodemap->nodes[j].flags & 
NODE_FLAGS_CONNECTED) {
+                               if ((nodemap->nodes[j].flags & 
NODE_FLAGS_CONNECTED) && 
+                                   
same_subnet(nodemap->nodes[j]->public_address, 
nodemap->nodes[i]->public_address, 
+                                               
nodemap->nodes[i]->public_netmask)) {
                                        ctdb->nodes[i]->takeover_vnn = 
nodemap->nodes[j].vnn;
                                        break;
                                }
                        }
                        if (j == i) {
-                               DEBUG(0,(__location__ " No node available to 
assign to??\n"));
-                               return -1;
+                               DEBUG(0,(__location__ " No node available on 
same network to take %s\n",
+                                        nodemap->nodes[i]->public_address));
+                               ctdb->nodes[i]->takeover_vnn = -1;      
                        }
                }
        }