Rev 586: merge from ronnie in http://samba.org/~tridge/ctdb

2007-08-02 Thread tridge 

revno: 586
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-08-03 13:18:44 +1000
message:
  merge from ronnie
added:
  common/rb_tree.c   rb_tree.c-20070724085023-9r1nhv41taadrjde-1
  common/rb_tree.h   rb_tree.h-20070724085025-nboaewff1rsepopq-1
  tests/rb_perftest.crb_perftest.c-20070730005029-azh0e7q5wzuu40vj-1
  utils/ utils-20070803001844-k0ekeu031hzlt8bg-1
  utils/smnotify/smnotify-20070803001844-k0ekeu031hzlt8bg-2
  utils/smnotify/smnotify.c  smnotify.c-20070803001844-k0ekeu031hzlt8bg-3
  utils/smnotify/smnotify.x  smnotify.x-20070803001844-k0ekeu031hzlt8bg-4
modified:
  Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1
  client/ctdb_client.c   ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1
  doc/ctdb.1.htmlctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1
  doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  server/ctdb_control.c  
ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
  server/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  server/ctdb_takeover.c 
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
  server/ctdb_tunables.c 
ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1
  tools/ctdb.c   
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1

revno: 432.1.170
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-08-03 10:47:37 +1000
message:
  dont wait for the default rpc timeout when trying to bing to a client.
  abort after 3 seconds
  
  fix makefile so that we generate the header before trying to compile 
  smnotify.o

revno: 432.1.169
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-08-03 10:18:48 +1000
message:
  add a small tool that can send smnotify packets

revno: 432.1.168
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-08-03 07:53:52 +1000
message:
  update the manpage for the -n option to make it clear we are referring 
  to the node number and not the node hostname

revno: 432.1.167
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-07-30 16:10:14 +1000
message:
  after we have checked dest address that it is a public address
  update addr to the source address so the rpintout in the log matches
  the client that attached to samba

revno: 432.1.166
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-07-30 10:50:35 +1000
message:
  add a small tool to compare rb tree with a timeval_compare()+add an 
  entry to the end of the list DLIST (worst case insert)

revno: 432.1.165
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-07-30 09:09:34 +1000
message:
  fix the remaining bugs with tree delete that testing found.
  
  the binary tree should work reasonably well now for delete.
  insert always worked fine.

revno: 432.1.164
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Thu 2007-07-26 07:22:36 +1000
message:
  remove dead code

revno: 432.1.163
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Thu 2007-07-26 07:21:32 +1000
message:
  fix some remaining bugs with deleting nodes

revno: 432.1.162
m

Rev 586: merge from ronnie in http://samba.org/~tridge/ctdb

2007-07-20 Thread tridge 

revno: 586
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.test
timestamp: Fri 2007-07-20 18:09:35 +1000
message:
  merge from ronnie
modified:
  server/ctdb_takeover.c 
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2

revno: 432.1.156
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-07-20 17:04:08 +1000
message:
  when a client connects with TCP_CLIENT  we should look at the 
  destination address to find the public address   not the source address
=== modified file 'server/ctdb_takeover.c'
--- a/server/ctdb_takeover.c2007-07-20 06:05:08 +
+++ b/server/ctdb_takeover.c2007-07-20 08:09:35 +
@@ -648,7 +648,7 @@
tcp = talloc(client, struct ctdb_tcp_list);
CTDB_NO_MEMORY(ctdb, tcp);
 
-   addr = inet_ntoa(p->src.sin_addr);
+   addr = inet_ntoa(p->dest.sin_addr);
 
takeover_vnn = find_public_ip_vnn(ctdb, addr);
if (takeover_vnn == -1) {