Rev 480: added timeouts in all event scripts in http://samba.org/~tridge/ctdb
revno: 480 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Wed 2007-06-06 13:45:12 +1000 message: added timeouts in all event scripts modified: common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1 common/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 common/ctdb_tunables.c ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 takeover/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2 takeover/system.c system.c-20070525071636-a5n1ihghjtppy08r-3 Diff too large for email (310, the limit is 200).
Rev 479: increase release number of ctdb in http://samba.org/~tridge/ctdb
revno: 479 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Wed 2007-06-06 12:10:42 +1000 message: increase release number of ctdb modified: packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3 === modified file 'packaging/RPM/ctdb.spec' --- a/packaging/RPM/ctdb.spec 2007-06-05 08:14:01 + +++ b/packaging/RPM/ctdb.spec 2007-06-06 02:10:42 + @@ -5,7 +5,7 @@ Packager: Samba Team <[EMAIL PROTECTED]> Name: ctdb Version: 1.0 -Release: 1 +Release: 2 Epoch: 0 License: GNU GPL version 2 Group: System Environment/Daemons
Rev 477: fixed error handling in event scripts in http://samba.org/~tridge/ctdb
revno: 477
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-06-06 11:27:06 +1000
message:
fixed error handling in event scripts
modified:
config/events events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'config/events'
--- a/config/events 2007-06-04 13:54:46 +
+++ b/config/events 2007-06-06 01:27:06 +
@@ -39,8 +39,8 @@
# call all application or local scripts
[ -d /etc/ctdb/events.d ] && {
# only accept scripts of the form NN.name
-/bin/ls /etc/ctdb/events.d | /bin/grep '^[0-9]*\.\w*$' | sort -n |
-while read SCRIPT; do
+scripts=`/bin/ls /etc/ctdb/events.d | /bin/grep '^[0-9]*\.\w*$' | sort -n`
+for SCRIPT in $scripts; do
[ -x /etc/ctdb/events.d/$SCRIPT ] && {
/etc/ctdb/events.d/$SCRIPT $cmd "$1" "$2" "$3" || exit 1
}
Rev 473: added 40.vsftpd to Makefile.in in http://samba.org/~tridge/ctdb
revno: 473 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Wed 2007-06-06 10:41:13 +1000 message: added 40.vsftpd to Makefile.in modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 === modified file 'Makefile.in' --- a/Makefile.in 2007-06-04 09:53:19 + +++ b/Makefile.in 2007-06-06 00:41:13 + @@ -109,6 +109,7 @@ install -m755 config/functions $(DESTDIR)$(etcdir)/ctdb install -m755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb install -m755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d + install -m755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d install -m755 config/events.d/50.samba $(DESTDIR)$(etcdir)/ctdb/events.d install -m755 config/events.d/59.nfslock $(DESTDIR)$(etcdir)/ctdb/events.d install -m755 config/events.d/60.nfs $(DESTDIR)$(etcdir)/ctdb/events.d
Rev 476: - fixed flags display in logs in http://samba.org/~tridge/ctdb
revno: 476
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-06-06 11:13:24 +1000
message:
- fixed flags display in logs
- added monitor handler to test event script
modified:
common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
tests/events events-20070601105359-jc8p0xp6iq7phful-1
=== modified file 'common/ctdb_recoverd.c'
--- a/common/ctdb_recoverd.c2007-06-06 00:25:46 +
+++ b/common/ctdb_recoverd.c2007-06-06 01:13:24 +
@@ -991,8 +991,7 @@
return;
}
- DEBUG(0,("Node %u has changed flags - was 0x%x now 0x%x\n",
-c->vnn, nodemap->nodes[i].flags, c->flags));
+ DEBUG(0,("Node %u has changed flags - now 0x%x\n", c->vnn, c->flags));
nodemap->nodes[i].flags = c->flags;
=== modified file 'tests/events'
--- a/tests/events 2007-06-01 10:54:26 +
+++ b/tests/events 2007-06-06 01:13:24 +
@@ -5,6 +5,10 @@
shift
case $cmd in
+monitor)
+ echo "`date` monitor event"
+ exit 0
+ ;;
startup)
echo "`date` ctdb startup event"
exit 0;
Rev 475: send the right sort of message on monitoring failure in http://samba.org/~tridge/ctdb
revno: 475 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Wed 2007-06-06 11:12:45 +1000 message: send the right sort of message on monitoring failure modified: common/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1 === modified file 'common/ctdb_monitor.c' --- a/common/ctdb_monitor.c 2007-06-06 00:25:46 + +++ b/common/ctdb_monitor.c 2007-06-06 01:12:45 + @@ -122,7 +122,7 @@ data.dsize = sizeof(c); /* tell the recmaster that something has changed */ - ctdb_send_message(ctdb, ctdb->recovery_master, CTDB_SRVID_NODE_FLAGS_CHANGED, data); + ctdb_daemon_send_message(ctdb, ctdb->recovery_master, CTDB_SRVID_NODE_FLAGS_CHANGED, data); }
Rev 478: - added monitoring of rpc ports for nfs, and of Samba ports and directories in http://samba.org/~tridge/ctdb
revno: 478
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-06-06 12:08:42 +1000
message:
- added monitoring of rpc ports for nfs, and of Samba ports and directories
- added monitoring of the ethernet link state
When monitoring detects an error, the node loses its public IP address
modified:
common/ctdb_tunables.c
ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1
config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1
config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3
config/events.d/59.nfslock nfslock-20070601105340-vlcvnp6euoj3zdwy-2
config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
config/functions functions-20070601105405-gajwirydr5a9zd6x-1
=== modified file 'common/ctdb_tunables.c'
--- a/common/ctdb_tunables.c2007-06-06 00:25:46 +
+++ b/common/ctdb_tunables.c2007-06-06 02:08:42 +
@@ -36,7 +36,7 @@
{ "RecoverInterval", 1, offsetof(struct ctdb_tunable,
recover_interval) },
{ "ElectionTimeout", 3, offsetof(struct ctdb_tunable,
election_timeout) },
{ "TakeoverTimeout", 5, offsetof(struct ctdb_tunable,
takeover_timeout) },
- { "MonitorInterval", 60, offsetof(struct ctdb_tunable,
monitor_interval) },
+ { "MonitorInterval", 15, offsetof(struct ctdb_tunable,
monitor_interval) },
};
/*
=== modified file 'config/events.d/10.interface'
--- a/config/events.d/10.interface 2007-06-04 05:09:03 +
+++ b/config/events.d/10.interface 2007-06-06 02:08:42 +
@@ -6,6 +6,9 @@
# public interface
. /etc/ctdb/functions
+loadconfig ctdb
+
+[ -z "$CTDB_PUBLIC_INTERFACE" ] && exit 0
cmd="$1"
shift
@@ -73,6 +76,15 @@
shutdown)
;;
+ monitor)
+ [ -x /usr/sbin/ethtool ] && {
+ /usr/sbin/ethtool $CTDB_PUBLIC_INTERFACE | grep 'Link detected:
yes' > /dev/null || {
+ echo "`date` ERROR: No link on network interface
$CTDB_PUBLIC_INTERFACE"
+ exit 1
+ }
+ }
+ ;;
+
esac
exit 0
=== modified file 'config/events.d/50.samba'
--- a/config/events.d/50.samba 2007-06-05 07:43:19 +
+++ b/config/events.d/50.samba 2007-06-06 02:08:42 +
@@ -50,6 +50,15 @@
service smb stop
service winbind stop
;;
+
+ monitor)
+ smb_dirs=`testparm -st 2> /dev/null | egrep '^\s*path = ' | cut -d=
-f2`
+ ctdb_check_directories "Samba" $smb_dirs
+
+ smb_ports=`testparm -stv 2> /dev/null | egrep '\s*smb ports =' | cut
-d= -f2`
+ ctdb_check_tcp_ports "Samba" $smb_ports
+ ;;
+
esac
# ignore unknown commands
=== modified file 'config/events.d/59.nfslock'
--- a/config/events.d/59.nfslock2007-06-05 08:16:45 +
+++ b/config/events.d/59.nfslock2007-06-06 02:08:42 +
@@ -51,6 +51,14 @@
/bin/rm -f /etc/ctdb/state/statd/restart
;;
+
+ monitor)
+ # check that lockd responds to rpc requests
+ ctdb_check_rpc "statd" 100024 1
+ ctdb_check_rpc "lockd" 100021 1
+ ctdb_check_directories "statd" $STATD_SHARED_DIRECTORY
+ ;;
+
esac
exit 0
=== modified file 'config/events.d/60.nfs'
--- a/config/events.d/60.nfs2007-06-05 05:18:37 +
+++ b/config/events.d/60.nfs2007-06-06 02:08:42 +
@@ -9,6 +9,8 @@
cmd="$1"
shift
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+
case $cmd in
startup)
mkdir -p /etc/ctdb/state/nfs
@@ -45,6 +47,16 @@
/bin/rm -f /etc/ctdb/state/nfs/restart
;;
+ monitor)
+ # check that NFS responds to rpc requests
+ ctdb_check_rpc "NFS" 13 3
+ ctdb_check_rpc "mount" 15 1
+
+ # and that its directories are available
+ nfs_dirs=`grep -v '^#' < /etc/exports | cut -d' ' -f1`
+ ctdb_check_directories "nfs" $nfs_dirs
+ ;;
+
esac
exit 0
=== modified file 'config/functions'
--- a/config/functions 2007-06-03 12:07:07 +
+++ b/config/functions 2007-06-06 02:08:42 +
@@ -28,7 +28,7 @@
##
# wait for a set of tcp ports
-# usage: ctdb_wait_tcp_ports SERICE_NAME
+# usage: ctdb_wait_tcp_ports SERVICE_NAME
##
ctdb_wait_tcp_ports() {
service_name="$1"
@@ -59,9 +59,10 @@
}
+
##
# wait for a set of directories
-# usage: ctdb_wait_directories SERICE_NAME
+# usage: ctdb_wait_directories SERVICE_NAME
##
ctdb_wait_directories() {
service_name="$1"
@@ -84,3 +85,58 @@
echo "`/bin/date` Local directories for $service_name are available"
}
+
+##
+# check that a rpc server is registered with portmap
+# an
Rev 474: fixed exit code in makerpms.sh in http://samba.org/~tridge/ctdb
revno: 474
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-06-06 11:12:14 +1000
message:
fixed exit code in makerpms.sh
modified:
packaging/RPM/makerpms.sh makerpms.sh-20070527204758-biuh7znabuwan3zn-4
=== modified file 'packaging/RPM/makerpms.sh'
--- a/packaging/RPM/makerpms.sh 2007-06-01 13:25:33 +
+++ b/packaging/RPM/makerpms.sh 2007-06-06 01:12:14 +
@@ -81,7 +81,7 @@
##
echo "$(basename $0): Getting Ready to build release package"
cd ${SPECDIR}
-${RPMBUILD} -ba --clean --rmsource $EXTRA_OPTIONS $SPECFILE
+${RPMBUILD} -ba --clean --rmsource $EXTRA_OPTIONS $SPECFILE || exit 1
echo "$(basename $0): Done."
[ ${REMOVE_LN} ] && /bin/rm -f $REMOVE_LN
svn commit: samba r23361 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet
Date: 2007-06-06 01:36:15 + (Wed, 06 Jun 2007)
New Revision: 23361
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23361
Log:
Merge from SAMBA_4_0_RELEASE:
Print the smb.conf path being created in provision.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/scripting/libjs/provision.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-06-06
01:33:20 UTC (rev 23360)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-06-06
01:36:15 UTC (rev 23361)
@@ -547,7 +547,7 @@
/* only install a new smb.conf if there isn't one there already */
var st = sys.stat(paths.smbconf);
if (st == undefined) {
- message("Setting up smb.conf\n");
+ message("Setting up " + paths.smbconf +"\n");
setup_file("provision.smb.conf", info.message, paths.smbconf,
subobj);
lp.reload();
}
svn commit: samba r23360 - in branches/SAMBA_4_0_RELEASE/source/scripting/libjs: .
Author: abartlet
Date: 2007-06-06 01:33:20 + (Wed, 06 Jun 2007)
New Revision: 23360
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23360
Log:
I think it is useful to print the full path to the smb.conf being set up.
Andrew Bartlett
Modified:
branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
2007-06-06 00:42:10 UTC (rev 23359)
+++ branches/SAMBA_4_0_RELEASE/source/scripting/libjs/provision.js
2007-06-06 01:33:20 UTC (rev 23360)
@@ -547,7 +547,7 @@
/* only install a new smb.conf if there isn't one there already */
var st = sys.stat(paths.smbconf);
if (st == undefined) {
- message("Setting up smb.conf\n");
+ message("Setting up " + paths.smbconf +"\n");
setup_file("provision.smb.conf", info.message, paths.smbconf,
subobj);
lp.reload();
}
svn commit: samba r23359 - in branches: SAMBA_3_0/source/torture SAMBA_3_0_25/source/torture SAMBA_3_0_26/source/torture
Author: jra Date: 2007-06-06 00:42:10 + (Wed, 06 Jun 2007) New Revision: 23359 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23359 Log: Fix bug #4537, fix from [EMAIL PROTECTED] Jeremy. Modified: branches/SAMBA_3_0/source/torture/denytest.c branches/SAMBA_3_0_25/source/torture/denytest.c branches/SAMBA_3_0_26/source/torture/denytest.c Changeset: Modified: branches/SAMBA_3_0/source/torture/denytest.c === --- branches/SAMBA_3_0/source/torture/denytest.c2007-06-05 23:35:39 UTC (rev 23358) +++ branches/SAMBA_3_0/source/torture/denytest.c2007-06-06 00:42:10 UTC (rev 23359) @@ -1515,7 +1515,7 @@ enum deny_result res; const char *fname = fnames[denytable2[i].isexe]; - progress_bar(i, ARRAY_SIZE(denytable1)); + progress_bar(i, ARRAY_SIZE(denytable2)); fnum1 = cli_open(cli1, fname, denytable2[i].mode1, Modified: branches/SAMBA_3_0_25/source/torture/denytest.c === --- branches/SAMBA_3_0_25/source/torture/denytest.c 2007-06-05 23:35:39 UTC (rev 23358) +++ branches/SAMBA_3_0_25/source/torture/denytest.c 2007-06-06 00:42:10 UTC (rev 23359) @@ -1515,7 +1515,7 @@ enum deny_result res; const char *fname = fnames[denytable2[i].isexe]; - progress_bar(i, ARRAY_SIZE(denytable1)); + progress_bar(i, ARRAY_SIZE(denytable2)); fnum1 = cli_open(cli1, fname, denytable2[i].mode1, Modified: branches/SAMBA_3_0_26/source/torture/denytest.c === --- branches/SAMBA_3_0_26/source/torture/denytest.c 2007-06-05 23:35:39 UTC (rev 23358) +++ branches/SAMBA_3_0_26/source/torture/denytest.c 2007-06-06 00:42:10 UTC (rev 23359) @@ -1515,7 +1515,7 @@ enum deny_result res; const char *fname = fnames[denytable2[i].isexe]; - progress_bar(i, ARRAY_SIZE(denytable1)); + progress_bar(i, ARRAY_SIZE(denytable2)); fnum1 = cli_open(cli1, fname, denytable2[i].mode1,
Rev 472: merged vsftpd event script from ronnie in http://samba.org/~tridge/ctdb
revno: 472
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-06-06 10:29:27 +1000
message:
merged vsftpd event script from ronnie
added:
config/events.d/40.vsftpd 40.vsftpd-20070605080716-mih15mjbgsjt7niv-1
modified:
config/events.d/59.nfslock nfslock-20070601105340-vlcvnp6euoj3zdwy-2
packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
tools/ctdb_control.c
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
web/ctdb.html ctdb.html-20070601052353-vgod9lfo4an4o83j-2
revno: 432.1.27
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 18:42:49 +1000
message:
ctdb is only a ha solution when combined with a cluster filesystem
revno: 432.1.26
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 18:40:43 +1000
message:
add some text about CTDB and in which scenarios it would be a good
candidate to solve the users needs for a HA solution
revno: 432.1.25
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 18:32:06 +1000
message:
provide machinereadable output for ctdb ip
revno: 432.1.24
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 18:16:45 +1000
message:
merge from tridge
revno: 432.1.23
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 18:14:01 +1000
message:
add a simple events script to manage vsftpd
revno: 432.1.22
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 12:43:35 +1000
message:
dont use CTDB_MANAGES_NFS for controlling the lockmanager
use a dedicated variable CTDB_MANAGES_NFSLOCK since some might want to
use nfs but no lockmanager
revno: 432.1.21
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-06-05 08:43:30 +1000
message:
merge from tridge
=== added file 'config/events.d/40.vsftpd'
--- a/config/events.d/40.vsftpd 1970-01-01 00:00:00 +
+++ b/config/events.d/40.vsftpd 2007-06-05 08:14:01 +
@@ -0,0 +1,45 @@
+#!/bin/sh
+# event strict to manage vsftpd in a cluster environment
+
+. /etc/ctdb/functions
+loadconfig vsftpd
+
+[ "$CTDB_MANAGES_VSFTPD" = "yes" ] || exit 0
+
+cmd="$1"
+shift
+
+case $cmd in
+ startup)
+ /bin/mkdir -p /etc/ctdb/state/vsftpd
+
+ # make sure the service is stopped first
+ service vsftpd stop > /dev/null 2>&1
+ service vsftpd start
+ ;;
+
+ shutdown)
+ service vsftpd stop
+ ;;
+
+ takeip)
+ echo "restart" >> /etc/ctdb/state/vsftpd/restart
+ ;;
+
+ releaseip)
+ echo "restart" >> /etc/ctdb/state/vsftpd/restart
+ ;;
+
+ recovered)
+ # if we have taken or released any ips we must
+ # restart vsftpd to ensure that all tcp connections are reset
+ [ -f /etc/ctdb/state/vsftpd/restart ] && {
+ service vsftpd stop > /dev/null 2>&1
+ service vsftpd start
+ } >/dev/null 2>&1
+
+ /bin/rm -f /etc/ctdb/state/vsftpd/restart
+ ;;
+esac
+
+exit 0
=== modified file 'config/events.d/59.nfslock'
--- a/config/events.d/59.nfslock2007-06-05 05:18:37 +
+++ b/config/events.d/59.nfslock2007-06-05 08:16:45 +
@@ -4,7 +4,7 @@
. /etc/ctdb/functions
loadconfig nfs
-[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
+[ "$CTDB_MANAGES_NFSLOCK" = "yes" ] || exit 0
[ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec 2007-06-04 05:09:03 +
+++ b/packaging/RPM/ctdb.spec 2007-06-05 08:14:01 +
@@ -94,6 +94,7 @@
%{_sysconfdir}
Rev 471: added health monitoring logic to ctdb, so a node loses its public IP address if one of the sybsystem event scripts reports a problem in http://samba.org/~tridge/ctdb
revno: 471 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Wed 2007-06-06 10:25:46 +1000 message: added health monitoring logic to ctdb, so a node loses its public IP address if one of the sybsystem event scripts reports a problem modified: common/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1 common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 common/ctdb_tunables.c ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 Diff too large for email (402, the limit is 200).
Build status as of Wed Jun 6 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-06-05 00:01:49.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-06 00:00:23.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Jun 5 00:00:03 2007 +Build status as of Wed Jun 6 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -17,7 +17,7 @@ samba0 0 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 35 22 3 +samba4 35 21 2 samba_3_038 16 0 smb-build35 35 0 talloc 38 8 0
svn commit: samba r23358 - in branches: SAMBA_3_0/source/auth SAMBA_3_0_25/source/auth SAMBA_3_0_26/source/auth
Author: jra
Date: 2007-06-05 23:35:39 + (Tue, 05 Jun 2007)
New Revision: 23358
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23358
Log:
Fix from Justin Maggard <[EMAIL PROTECTED]> - ensure we don't
expire a password if it's explicitly set as ACB_PWNOTREQ.
Jeremy.
Modified:
branches/SAMBA_3_0/source/auth/auth_sam.c
branches/SAMBA_3_0_25/source/auth/auth_sam.c
branches/SAMBA_3_0_26/source/auth/auth_sam.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_sam.c
===
--- branches/SAMBA_3_0/source/auth/auth_sam.c 2007-06-05 19:17:05 UTC (rev
23357)
+++ branches/SAMBA_3_0/source/auth/auth_sam.c 2007-06-05 23:35:39 UTC (rev
23358)
@@ -163,7 +163,7 @@
return NT_STATUS_ACCOUNT_EXPIRED;
}
- if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP) &&
!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) {
time_t must_change_time =
pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);
Modified: branches/SAMBA_3_0_25/source/auth/auth_sam.c
===
--- branches/SAMBA_3_0_25/source/auth/auth_sam.c2007-06-05 19:17:05 UTC
(rev 23357)
+++ branches/SAMBA_3_0_25/source/auth/auth_sam.c2007-06-05 23:35:39 UTC
(rev 23358)
@@ -163,7 +163,7 @@
return NT_STATUS_ACCOUNT_EXPIRED;
}
- if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP) &&
!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) {
time_t must_change_time =
pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);
Modified: branches/SAMBA_3_0_26/source/auth/auth_sam.c
===
--- branches/SAMBA_3_0_26/source/auth/auth_sam.c2007-06-05 19:17:05 UTC
(rev 23357)
+++ branches/SAMBA_3_0_26/source/auth/auth_sam.c2007-06-05 23:35:39 UTC
(rev 23358)
@@ -163,7 +163,7 @@
return NT_STATUS_ACCOUNT_EXPIRED;
}
- if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP) &&
!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) {
time_t must_change_time =
pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);
svn commit: samba r23357 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/lib SAMBA_3_0_26/source/lib
Author: jra Date: 2007-06-05 19:17:05 + (Tue, 05 Jun 2007) New Revision: 23357 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23357 Log: timespec_current() was returning the wrong ns time (multiplying tv_sec, not tv_usec). Jeremy. Modified: branches/SAMBA_3_0/source/lib/time.c branches/SAMBA_3_0_25/source/lib/time.c branches/SAMBA_3_0_26/source/lib/time.c Changeset: Modified: branches/SAMBA_3_0/source/lib/time.c === --- branches/SAMBA_3_0/source/lib/time.c2007-06-05 12:58:18 UTC (rev 23356) +++ branches/SAMBA_3_0/source/lib/time.c2007-06-05 19:17:05 UTC (rev 23357) @@ -,7 +,7 @@ struct timespec ts; GetTimeOfDay(&tv); ts.tv_sec = tv.tv_sec; - ts.tv_nsec = tv.tv_sec * 1000; + ts.tv_nsec = tv.tv_usec * 1000; return ts; } Modified: branches/SAMBA_3_0_25/source/lib/time.c === --- branches/SAMBA_3_0_25/source/lib/time.c 2007-06-05 12:58:18 UTC (rev 23356) +++ branches/SAMBA_3_0_25/source/lib/time.c 2007-06-05 19:17:05 UTC (rev 23357) @@ -,7 +,7 @@ struct timespec ts; GetTimeOfDay(&tv); ts.tv_sec = tv.tv_sec; - ts.tv_nsec = tv.tv_sec * 1000; + ts.tv_nsec = tv.tv_usec * 1000; return ts; } Modified: branches/SAMBA_3_0_26/source/lib/time.c === --- branches/SAMBA_3_0_26/source/lib/time.c 2007-06-05 12:58:18 UTC (rev 23356) +++ branches/SAMBA_3_0_26/source/lib/time.c 2007-06-05 19:17:05 UTC (rev 23357) @@ -,7 +,7 @@ struct timespec ts; GetTimeOfDay(&tv); ts.tv_sec = tv.tv_sec; - ts.tv_nsec = tv.tv_sec * 1000; + ts.tv_nsec = tv.tv_usec * 1000; return ts; }
svn commit: samba-web r1122 - in trunk/history: .
Author: jerry Date: 2007-06-05 13:06:32 + (Tue, 05 Jun 2007) New Revision: 1122 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1122 Log: update May 14 list of patch descriptions Modified: trunk/history/security.html Changeset: Modified: trunk/history/security.html === --- trunk/history/security.html 2007-06-05 12:09:52 UTC (rev 1121) +++ trunk/history/security.html 2007-06-05 13:06:32 UTC (rev 1122) @@ -23,8 +23,8 @@ 14 May 2007 -patch for Samba 3.0.24 -Remote Command Injection Vulnerability +patch for Samba 3.0.24 +Remote Command Injection Vulnerabilita (Updated June 5 to include missing "c" character from INCLUDE list).y Samba 3.0.0 - 3.0.25rc3 http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2447";>CVE-2007-2447 Announcement @@ -32,7 +32,7 @@ 14 May 2007 patch for Samba 3.0.24 -Multiple Heap Overflows Allow Remote Code Execution +Multiple Heap Overflows Allow Remote Code Execution (Updated May 25 to fix regression in Samba domian controller logon code). Samba 3.0.0 - 3.0.25rc3 http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2446";>CVE-2007-2446 Announcement @@ -40,7 +40,7 @@ 14 May 2007 patch for Samba 3.0.24 -Local SID/Name translation bug can result in user privilege elevation +Local SID/Name translation bug can result in user privilege elevation (Updated May 25 to fix regression in the "force group" parameter). Samba 3.0.23d - 3.0.25pre2 http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2444";>CVE-2007-2444 Announcement
svn commit: samba r23356 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/lib SAMBA_3_0_26/source/lib
Author: idra Date: 2007-06-05 12:58:18 + (Tue, 05 Jun 2007) New Revision: 23356 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23356 Log: We missed to add the 'c' character to the list of valid ones for shell escaping. I hate this kind of bugs more than how Jeremy hates off by ones :( Simo. Modified: branches/SAMBA_3_0/source/lib/util_str.c branches/SAMBA_3_0_25/source/lib/util_str.c branches/SAMBA_3_0_26/source/lib/util_str.c Changeset: Modified: branches/SAMBA_3_0/source/lib/util_str.c === --- branches/SAMBA_3_0/source/lib/util_str.c2007-06-05 10:49:05 UTC (rev 23355) +++ branches/SAMBA_3_0/source/lib/util_str.c2007-06-05 12:58:18 UTC (rev 23356) @@ -2622,7 +2622,7 @@ of characters. UNIX charset format. ***/ -#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijklmnopqrstuvwxyz_/ \t.," +#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.," #define INSIDE_DQUOTE_LIST "$`\n\"\\" char *escape_shell_string(const char *src) Modified: branches/SAMBA_3_0_25/source/lib/util_str.c === --- branches/SAMBA_3_0_25/source/lib/util_str.c 2007-06-05 10:49:05 UTC (rev 23355) +++ branches/SAMBA_3_0_25/source/lib/util_str.c 2007-06-05 12:58:18 UTC (rev 23356) @@ -2622,7 +2622,7 @@ of characters. UNIX charset format. ***/ -#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijklmnopqrstuvwxyz_/ \t.," +#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.," #define INSIDE_DQUOTE_LIST "$`\n\"\\" char *escape_shell_string(const char *src) Modified: branches/SAMBA_3_0_26/source/lib/util_str.c === --- branches/SAMBA_3_0_26/source/lib/util_str.c 2007-06-05 10:49:05 UTC (rev 23355) +++ branches/SAMBA_3_0_26/source/lib/util_str.c 2007-06-05 12:58:18 UTC (rev 23356) @@ -2622,7 +2622,7 @@ of characters. UNIX charset format. ***/ -#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijklmnopqrstuvwxyz_/ \t.," +#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.," #define INSIDE_DQUOTE_LIST "$`\n\"\\" char *escape_shell_string(const char *src)
svn commit: samba-web r1121 - in trunk: .
Author: jerry Date: 2007-06-05 12:09:52 + (Tue, 05 Jun 2007) New Revision: 1121 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1121 Log: remove news include while news.samba.org is offline Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2007-06-02 11:36:08 UTC (rev 1120) +++ trunk/index.html2007-06-05 12:09:52 UTC (rev 1121) @@ -15,7 +15,7 @@ Conservancy. Latest News - +News headlines are currently unavailable. Current Release
svn commit: samba r23355 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: gd
Date: 2007-06-05 10:49:05 + (Tue, 05 Jun 2007)
New Revision: 23355
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23355
Log:
Fix some more build warnings.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-05 10:23:56 UTC
(rev 23354)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-05 10:49:05 UTC
(rev 23355)
@@ -969,7 +969,7 @@
goto done;
}
- DEBUG(10, ("ads lookup_groupmem: got %d sids via extended dn call\n",
num_members));
+ DEBUG(10, ("ads lookup_groupmem: got %d sids via extended dn call\n",
(int)num_members));
/* Now that we have a list of sids, we need to get the
* lists of names and name_types belonging to these sids.
@@ -1078,7 +1078,7 @@
else if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("lookup_groupmem: Error looking up %d "
"sids via rpc_lsa_lookup_sids: %s\n",
- num_members, nt_errstr(status)));
+ (int)num_members, nt_errstr(status)));
goto done;
}
}
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-05 10:23:56 UTC
(rev 23354)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-05 10:49:05 UTC
(rev 23355)
@@ -3419,7 +3419,7 @@
if (bytes_read != sizeof(v_status)) {
DEBUG(10, ("winbindd_validate_cache: read %d bytes from pipe "
- "but expected %d", bytes_read, sizeof(v_status)));
+ "but expected %d", bytes_read,
(int)sizeof(v_status)));
DEBUGADD(10, (" -> assuming child crashed\n"));
v_status.success = False;
}
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-05
10:23:56 UTC (rev 23354)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-05
10:49:05 UTC (rev 23355)
@@ -969,7 +969,7 @@
goto done;
}
- DEBUG(10, ("ads lookup_groupmem: got %d sids via extended dn call\n",
num_members));
+ DEBUG(10, ("ads lookup_groupmem: got %d sids via extended dn call\n",
(int)num_members));
/* Now that we have a list of sids, we need to get the
* lists of names and name_types belonging to these sids.
@@ -1078,7 +1078,7 @@
else if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("lookup_groupmem: Error looking up %d "
"sids via rpc_lsa_lookup_sids: %s\n",
- num_members, nt_errstr(status)));
+ (int)num_members, nt_errstr(status)));
goto done;
}
}
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-05
10:23:56 UTC (rev 23354)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-05
10:49:05 UTC (rev 23355)
@@ -3419,7 +3419,7 @@
if (bytes_read != sizeof(v_status)) {
DEBUG(10, ("winbindd_validate_cache: read %d bytes from pipe "
- "but expected %d", bytes_read, sizeof(v_status)));
+ "but expected %d", bytes_read,
(int)sizeof(v_status)));
DEBUGADD(10, (" -> assuming child crashed\n"));
v_status.success = False;
}
svn commit: samba r23354 - in branches: SAMBA_3_0/source/libgpo SAMBA_3_0_26/source/libgpo
Author: gd Date: 2007-06-05 10:23:56 + (Tue, 05 Jun 2007) New Revision: 23354 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23354 Log: Fix build warning. Guenther Modified: branches/SAMBA_3_0/source/libgpo/gpo_sec.c branches/SAMBA_3_0_26/source/libgpo/gpo_sec.c Changeset: Modified: branches/SAMBA_3_0/source/libgpo/gpo_sec.c === --- branches/SAMBA_3_0/source/libgpo/gpo_sec.c 2007-06-05 06:12:48 UTC (rev 23353) +++ branches/SAMBA_3_0/source/libgpo/gpo_sec.c 2007-06-05 10:23:56 UTC (rev 23354) @@ -49,6 +49,7 @@ return (access_mask & SEC_RIGHTS_APPLY_GROUP_POLICY); } +#if 0 / / @@ -60,8 +61,8 @@ return (read_bits == (access_mask & read_bits)); } +#endif - / / Modified: branches/SAMBA_3_0_26/source/libgpo/gpo_sec.c === --- branches/SAMBA_3_0_26/source/libgpo/gpo_sec.c 2007-06-05 06:12:48 UTC (rev 23353) +++ branches/SAMBA_3_0_26/source/libgpo/gpo_sec.c 2007-06-05 10:23:56 UTC (rev 23354) @@ -49,6 +49,7 @@ return (access_mask & SEC_RIGHTS_APPLY_GROUP_POLICY); } +#if 0 / / @@ -60,8 +61,8 @@ return (read_bits == (access_mask & read_bits)); } +#endif - / /
Rev 469: first step in health monitoring of cluster nodes. When not healthy they will be marked disabled in http://samba.org/~tridge/ctdb
revno: 469
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Tue 2007-06-05 17:43:19 +1000
message:
first step in health monitoring of cluster nodes. When not healthy they will
be marked disabled
modified:
common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2
common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
common/ctdb_traverse.c
ctdb_traverse.c-20070503021550-ztfs5rwx8jfm8qqx-1
common/ctdb_tunables.c
ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1
config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
takeover/ctdb_takeover.c
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
tools/ctdb_control.c
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
=== modified file 'common/ctdb.c'
--- a/common/ctdb.c 2007-06-04 10:22:44 +
+++ b/common/ctdb.c 2007-06-05 07:43:19 +
@@ -222,14 +222,16 @@
}
/*
- return the number of connected nodes
+ return the number of enabled nodes
*/
-uint32_t ctdb_get_num_connected_nodes(struct ctdb_context *ctdb)
+uint32_t ctdb_get_num_enabled_nodes(struct ctdb_context *ctdb)
{
int i;
uint32_t count=0;
for (i=0;ivnn_map->size;i++) {
- if (ctdb->nodes[ctdb->vnn_map->map[i]]->flags &
NODE_FLAGS_CONNECTED) {
+ struct ctdb_node *node = ctdb->nodes[ctdb->vnn_map->map[i]];
+ if ((node->flags & NODE_FLAGS_CONNECTED) &&
+ !(node->flags & NODE_FLAGS_DISABLED)) {
count++;
}
}
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c 2007-06-04 11:11:51 +
+++ b/common/ctdb_client.c 2007-06-05 07:43:19 +
@@ -1364,7 +1364,7 @@
ctdb_db->db_id = *(uint32_t *)data.dptr;
talloc_free(data.dptr);
- ret = ctdb_ctrl_getdbpath(ctdb, timeval_current_ofs(1, 0),
CTDB_CURRENT_NODE, ctdb_db->db_id, ctdb_db, &ctdb_db->db_path);
+ ret = ctdb_ctrl_getdbpath(ctdb, timeval_current_ofs(2, 0),
CTDB_CURRENT_NODE, ctdb_db->db_id, ctdb_db, &ctdb_db->db_path);
if (ret != 0) {
DEBUG(0,("Failed to get dbpath for database '%s'\n", name));
talloc_free(ctdb_db);
=== modified file 'common/ctdb_recoverd.c'
--- a/common/ctdb_recoverd.c2007-06-04 10:22:44 +
+++ b/common/ctdb_recoverd.c2007-06-05 07:43:19 +
@@ -697,6 +697,8 @@
"MonitorFrequency",
&ctdb->tunable.monitor_frequency);
ctdb_ctrl_get_tunable(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE,
"ElectionTimeout",
&ctdb->tunable.election_timeout);
+ ctdb_ctrl_get_tunable(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE,
+ "TakeoverTimeout",
&ctdb->tunable.takeover_timeout);
vnn = ctdb_ctrl_getvnn(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE);
if (vnn == (uint32_t)-1) {
=== modified file 'common/ctdb_traverse.c'
--- a/common/ctdb_traverse.c2007-06-04 07:46:37 +
+++ b/common/ctdb_traverse.c2007-06-05 07:43:19 +
@@ -372,7 +372,7 @@
if (key.dsize == 0 && data.dsize == 0) {
state->null_count++;
- if (state->null_count != ctdb_get_num_connected_nodes(ctdb)) {
+ if (state->null_count != ctdb_get_num_enabled_nodes(ctdb)) {
return 0;
}
}
=== modified file 'common/ctdb_tunables.c'
--- a/common/ctdb_tunables.c2007-06-04 10:22:44 +
+++ b/common/ctdb_tunables.c2007-06-05 07:43:19 +
@@ -35,6 +35,7 @@
{ "RecoverTimeout",5, offsetof(struct ctdb_tunable,
recover_timeout) },
{ "MonitorFrequency", 1, offsetof(struct ctdb_tunable,
monitor_frequency) },
{ "ElectionTimeout", 3, offsetof(struct ctdb_tunable,
election_timeout) },
+ { "TakeoverTimeout", 5, offsetof(struct ctdb_tunable,
takeover_timeout) },
};
/*
=== modified file 'config/events.d/50.samba'
--- a/config/events.d/50.samba 2007-06-05 05:18:37 +
+++ b/config/events.d/50.samba 2007-06-05 07:43:19 +
@@ -21,8 +21,10 @@
service smb stop > /dev/null 2>&1
service winbind stop > /dev/null 2>&1
- # start Samba service
- service smb start
+ # start Samba service. Start it reniced, as under very heavy load
+ # the number of smbd processes will mean that it leaves few cycles for
+ # anything else
+ nice service smb start
service winbind start
# wait for the Samba tcp ports to become available
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-06-04 12:13:59 +000
Rev 470: clean out some more cruft in http://samba.org/~tridge/ctdb
revno: 470 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Tue 2007-06-05 17:57:07 +1000 message: clean out some more cruft modified: common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_message.c ctdb_message.c-20070208224107-9dnio7x7z33prrmt-1 common/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 common/ctdb_traverse.c ctdb_traverse.c-20070503021550-ztfs5rwx8jfm8qqx-1 common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3 common/util.c util.c-20061117234101-o3qt14umlg9en8z0-20 direct/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 ib/ibw_ctdb_init.c ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tcp/tcp_init.c tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2 Diff too large for email (439, the limit is 200).
