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

[tridge at samba.org]

------------------------------------------------------------
revno: 663
revision-id: tridge at samba.org-20071022002625-gyl2j3dht6pwyl26
parent: tridge at samba.org-20071019022224-7tsv4g0r4ck9q7pn
parent: sahlberg at ronnie-20071022001838-r8a5g20fm38xkzwv
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Mon 2007-10-22 10:26:25 +1000
message:
  merge from ronnie
modified:
  config/statd-callout           statdcallout-20070531010857-6sdlz455vusye5y5-1
    ------------------------------------------------------------
    revno: 432.1.330
    revision-id: sahlberg at ronnie-20071022001838-r8a5g20fm38xkzwv
    parent: sahlberg at ronnie-20071020204233-1s7eqwfny8wn4gdj
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Mon 2007-10-22 10:18:38 +1000
    message:
      dont set parameters in statd-callout     if they should be set they 
      bshould be set from 10.interfaces
    modified:
      config/statd-callout           statdcallout-20070531010857-6sdlz455vusye5y5-1
    ------------------------------------------------------------
    revno: 432.1.329
    revision-id: sahlberg at ronnie-20071020204233-1s7eqwfny8wn4gdj
    parent: sahlberg at ronnie-20071019051925-64bx1pmb8a9axlcc
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Sun 2007-10-21 06:42:33 +1000
    message:
      dont set some of the sysctl variables in statd-callout.    these are 
      mainly useful for avoiding ack-storms when doing very rapid 
      failover/failback during testing   but should not be required in 
      real-world.
      
      this gets rid of a lof of annoying messages from the messages file
    modified:
      config/statd-callout           statdcallout-20070531010857-6sdlz455vusye5y5-1
    ------------------------------------------------------------
    revno: 432.1.328
    revision-id: sahlberg at ronnie-20071019051925-64bx1pmb8a9axlcc
    parent: sahlberg at ronnie-20071019010312-rzo2gn30wbmy8vtd
    parent: tridge at samba.org-20071019022224-7tsv4g0r4ck9q7pn
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Fri 2007-10-19 15:19:25 +1000
    message:
      merge from tridge
    removed:
      lib/talloc/talloc.h.rej        talloc.h.rej-20070125040949-7t3f5zdl1q4z9hyv-53
    modified:
      packaging/RPM/ctdb.spec        ctdb.spec-20070527204758-biuh7znabuwan3zn-3
      server/ctdb_recover.c          ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
      server/ctdb_recoverd.c         recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
    ------------------------------------------------------------
    revno: 432.1.327
    revision-id: sahlberg at ronnie-20071019010312-rzo2gn30wbmy8vtd
    parent: sahlberg at ronnie-20071018230537-ywtg8qzc8i6w6wrn
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Fri 2007-10-19 11:03:12 +1000
    message:
      dont close the file, just set the fd to -1
    modified:
      tcp/tcp_init.c                 tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2
=== modified file 'config/statd-callout'
--- a/config/statd-callout	2007-09-14 04:14:03 +0000
+++ b/config/statd-callout	2007-10-22 00:18:38 +0000
@@ -50,9 +50,9 @@
 
 	# we need these settings to make sure that no tcp connections survive
 	# across a very fast failover/failback
-	echo 0 > /proc/sys/net/ipv4/tcp_max_tw_buckets
-	echo 0 > /proc/sys/net/ipv4/tcp_fin_timeout
-	echo 0 > /proc/sys/net/ipv4/tcp_max_orphans
+	#echo 10 > /proc/sys/net/ipv4/tcp_fin_timeout
+	#echo 0 > /proc/sys/net/ipv4/tcp_max_tw_buckets
+	#echo 0 > /proc/sys/net/ipv4/tcp_max_orphans
 
 	# rebuild the state directory for the local statd to use the correct
 	# state value and to initally send notifications to all clients