[SCM] CTDB repository - branch master updated -
ctdb-1.0.72-39-g972036a
Ronnie Sahlberg
sahlberg at samba.org
Tue Mar 24 06:50:36 GMT 2009
The branch, master has been updated
via 972036a5d510fb9b399f1ee34a8861dee4221267 (commit)
via 39a972b0d6d0d70282c25c54a124b67431467e77 (commit)
via ccaf9ebe062127124cf23e69dcd2ac2edda40020 (commit)
via b1aba6651143ae1c85b24d78b67c760795ff5bff (commit)
via 8518c9e0ffec44677d45f60e63936a831d62ab20 (commit)
via 36709e4325fe9a0f377e8e79741741ded4e7f7b0 (commit)
via f0e3cdde7bd35bb586a46c31609398b7d4b05a26 (commit)
via 124874847e5e03ce2a44bddfe778f01dfb0a7a03 (commit)
from 857733ae2bdfa0037af224abfabc020e2ac384c7 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 972036a5d510fb9b399f1ee34a8861dee4221267
Merge: 857733ae2bdfa0037af224abfabc020e2ac384c7 39a972b0d6d0d70282c25c54a124b67431467e77
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Mar 24 17:49:55 2009 +1100
Merge branch 'obnox'
commit 39a972b0d6d0d70282c25c54a124b67431467e77
Merge: ccaf9ebe062127124cf23e69dcd2ac2edda40020 c98f90ad61c9b1e679116fbed948ddca4111968d
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 10:07:44 2009 +0100
Merge commit 'ctdb-ronnie/master'
commit ccaf9ebe062127124cf23e69dcd2ac2edda40020
Author: Michael Adam <obnox at samba.org>
Date: Tue Mar 10 00:21:04 2009 +0100
ctdb.sysconfig: add CTDB_MANAGES_HTTPD comment section
Michael
commit b1aba6651143ae1c85b24d78b67c760795ff5bff
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 9 00:20:30 2009 +0100
events.d/50.samba: allow CTDB_SERVICE_{SMB,NMB,WINBIND} to be overriden from sysconfig
Michael
commit 8518c9e0ffec44677d45f60e63936a831d62ab20
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 9 00:08:26 2009 +0100
ctdb.sysconfig: add CTDB_INIT_STYLE with explanation
Michael
commit 36709e4325fe9a0f377e8e79741741ded4e7f7b0
Merge: f0e3cdde7bd35bb586a46c31609398b7d4b05a26 ecf26af22245d0f55aded50e8768b0c21495f98c
Author: Michael Adam <obnox at samba.org>
Date: Wed Mar 4 21:26:25 2009 +0100
Merge commit 'ctdb-ronnie/master'
commit ecf26af22245d0f55aded50e8768b0c21495f98c
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Wed Mar 4 07:25:26 2009 +1100
new version 1.0.73
commit 432604a1435cd2b5a7178fb5aedf1d4b61bffeb9
Author: root <root at rcn1.VSOFS1.COM>
Date: Wed Mar 4 07:21:55 2009 +1100
Add a variable CTDB_NFS_SKIP_SHARE_CHECK to sysconfig that can disable the check that all shares are accessable.
This can take very long if there are very many shares and is in that case better to implement in a separate cronjob than in ctdb eventscript
commit f0e3cdde7bd35bb586a46c31609398b7d4b05a26
Merge: 124874847e5e03ce2a44bddfe778f01dfb0a7a03 ef9dc810c4309e8eba18d015c73c1b5d0760a4e8
Author: Michael Adam <obnox at samba.org>
Date: Sat Feb 28 03:09:13 2009 +0100
Merge commit 'ctdb-ronnie/master'
commit 124874847e5e03ce2a44bddfe778f01dfb0a7a03
Author: Michael Adam <obnox at samba.org>
Date: Sat Feb 28 03:08:31 2009 +0100
move common code of system_linux.c and system_aix.c into new system_common.c
Michael
commit ef9dc810c4309e8eba18d015c73c1b5d0760a4e8
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Wed Feb 25 09:13:16 2009 +1100
From Sumit Bose <sbose at redhat.com>
Fix to the makefile dependencies for smnotify so that make -j works
commit 051ae5f3c13892b860818eac803d348f09845dc6
Author: root <root at test2n1.VSOFS1.COM>
Date: Fri Feb 20 10:58:34 2009 +1100
make it possible to disable checking all samba shares.
this is a timeconsuming process and might not be feasible to perform if there are very many thousand shares
commit 7412c6706c2d8ec668d0a6a50471db369f3dbf2b
Merge: e1c90b12290c682c2cba90e9afa3a09be014e20e e1be8cb2dc32f56eabd537b658b47929818b8d01
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 19 23:51:23 2009 +0100
Merge commit 'ctdb-ronnie/master'
commit e1be8cb2dc32f56eabd537b658b47929818b8d01
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Wed Feb 18 13:22:26 2009 +1100
new version 1.0.72
commit fe4eea45c6b5702a794424037c3f2ab4241d5e5e
Merge: 59a04a50e64aae0a89b165d0428e23a8bcf8eb24 4777b74b1e2eebe54cf27f3303f60e49023e7f6a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Wed Feb 18 13:10:03 2009 +1100
Merge branch 'martins'
commit e1c90b12290c682c2cba90e9afa3a09be014e20e
Merge: 2f42429f6996e98c9bfad49eab9fa23e85d7bec2 59a04a50e64aae0a89b165d0428e23a8bcf8eb24
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 10 00:28:08 2009 +0100
Merge commit 'ctdb-ronnie/master'
commit 59a04a50e64aae0a89b165d0428e23a8bcf8eb24
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Sat Feb 7 08:10:34 2009 +1100
add a licence file
commit dfb16ce9ed65048d30109851737a9075d071ecdb
Author: root <root at test1n1.VSOFS1.COM>
Date: Thu Feb 5 14:44:46 2009 +1100
use netstat to check first and only fall back to netcat if netstat is unavailable
commit 2f42429f6996e98c9bfad49eab9fa23e85d7bec2
Author: Mathieu PARENT <math.parent at gmail.com>
Date: Wed Feb 4 00:50:46 2009 +0100
correct ctdbd(1) manpage warning
Signed-off-by: Michael Adam <obnox at samba.org>
commit e391bde5ac743956fb30ede65030973a1f13dae5
Author: Mathieu PARENT <math.parent at gmail.com>
Date: Wed Feb 4 00:48:56 2009 +0100
smnotify: fix popt.h include to allow use of system lib
Signed-off-by: Michael Adam <obnox at samba.org>
commit b9e50e3416fecef6a881be3f1b91be977299293f
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 4 00:42:33 2009 +0100
events 41.httpd: support suse and ubuntu/debian systems for managing apache
The httpd service on suse and ubuntu/debian systems is usually
called "apache2" nowadays.
Note: There are older installs with Apache 1.3 out there, in which case
the service is called "apache". An extra check for these installs could
be useful as a sequel to this patch...
Michael
commit 9e2245b9bb795e2d757aacd706a9861a59d1638e
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 4 00:28:16 2009 +0100
build: print default in help for --with-logdir
Michael
commit 79b8c87338a2d40464e87e501daae403a2f14427
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 4 00:22:01 2009 +0100
make: add a "showlayout" target for diagnostics
Michael
commit b0c6854d1e886456fabdc8f1c3bd21c89311c601
Author: Mathieu PARENT <math.parent at gmail.com>
Date: Wed Feb 4 00:15:57 2009 +0100
build: Make log-directory configurable indepently of VARDIR
This adds a new configure option "--with-logdir".
logdir defaults to "${localstatedir}/log" .
It is important to have logdir configurable for debian systems,
where localstatedir is set to "/var/lib" and not "/var".
Signed-off-by: Michael Adam <obnox at samba.org>
commit dbd90f6210617b23d5695c4c868392363c75d23b
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 4 00:01:15 2009 +0100
events.d/41.httpd: fix a typo in the fix of the comment typo
This is embarassing...
Michael
commit a6cdf9106074890b76d2eabe496af244e0134d31
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Feb 2 14:04:40 2009 +1100
new version 1.0.71
commit 2634f1bd216ce18f061a282a53314cb1650dbd05
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 30 18:30:25 2009 +0100
add a simple test script to test ctdb_check_tcp_ports
Michael
commit 78e7928797e239e71f96eb001460a0dbf943e18f
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 30 18:14:41 2009 +0100
ctdb_check_tcp_ports: correctly detect listeners on ipv6 :::<port> w/out netcat
The netstat test only grepped for the ipv4 wildcard address.
Now the ipv6 wildcard listener is correctly detected as well.
Michael
commit 25d04bbe9528fafc68751f7beb22daeee3163d34
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 30 16:41:37 2009 +0100
ctdb_check_tcp_ports: fail the check if neither netstat nor netcat/nc is found
Michael
commit 3adf100e7f0c04aaf2da9ae4c6984cdb708c3b57
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 30 16:10:05 2009 +0100
ctdb_check_tcp_ports: cope with multiple locations of netcat or nc
This fixes tcp port monitor events on systems, where netcat or nc
is not found in /usr/bin/, Debian, for instance.
The patch also separates the process of finding the binaries and
calling them, moving the detection outside of the loop over the
ports list.
Michael
commit fedc6983f5dee39152e6f400f89a3e07eab57f0c
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 29 13:22:02 2009 +0100
remove include <netinet/in.h> from public ctdb.h
This is not portable.
The ctdb build includes the necessary headers from includes.h.
And users of ctdb should cope with including the necessary
prerequisite headers themselves.
Michael
commit 7c813406d6ba55f6a7418f80b13b0bc83cb67928
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 29 11:46:04 2009 +0100
packaging: add a maketarball script
The script extracts the version number from the spec file.
It takes an extra argument, that can be appended to the
version in the tar ball name and directory prefix.
Michael
commit 7558bca1e99884c02747adb7cbea799d04ee24d5
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 28 17:40:24 2009 +0100
Fix the build on AIX: sys/socket.h needs to be included before ctdb.h
(for struct sockaddr to be defined)
Thanks to William Jojo <w.jojo at hvcc.edu> for reporting.
Michael
commit f7be553ed0826d31759812d58db91589ccdf8a8c
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 29 10:22:02 2009 +0100
autoconf: Make sure the result of the mkdir_has_mode test gets cached.
This fixes the autoconf 2.63 warning
"suspicious cache-id, must contain _cv_ to be cached".
Thanks to William Jojo <w.jojo at hvcc.edu> for reporting.
Michael
commit c9a0330989421afc138db6d195acf93f5eeda9fb
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 27 17:17:58 2009 +0100
events.d/41.httpd: fix a comment typo
Michael
commit 9d12de1ca6107801dada927729e755c0949d73bf
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 15:33:24 2009 +0100
Fix treatment of link local ipv6 addresses: set the scope id.
metze / Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 1461b78c47810073f8637bc4592cacaadcdaf14b
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 14:14:07 2009 +0100
ctdb_util: use the parse_ip() function - avoid code duplication
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 8b5f1e80e3e2e9ca2198e1baee8af36aa5d6c5b5
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 19:08:37 2009 +0100
ctdb_sys_have_ip: fix ipv6 support for aix, too.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit de71ce2195bb4f6a96b12437a2d4d1424fd1c59c
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jan 19 13:24:09 2009 +0100
ctdb_sys_have_ip: don't overwrite input data (setting port to 0)
metze
Signed-off-by: Michael Adam <obnox at samba.org>
commit e0c70110e241b065c42c1c07f32c3657bac5d98b
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 12:02:18 2009 +0100
Fix verification of IP allocation with ipv6 addresses on Linux.
Set sin_port or sin6_port to 0, depending on sa_family.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit df0afcbf9a0308fcd6ddcce1ac9366f785576f44
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 21:22:58 2009 +0100
events 50.samba: fix control of nmbd without separate nmb service script.
protect all potentially empty $CTDB_SERVICE_* script names
Michael
commit c412c9e2d69a3f07e195259f6ad5767fa8160a94
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 14:46:30 2009 +0100
packaging(RPM): detect and use ccache if available
Michael
commit b74ef95004989bcfca5fc6468a6f978a196116ca
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 19 09:42:48 2009 +0100
Makefile: remove extra "/" in paths
Michael
commit 0dafb869265d0c369bb5ce45fbcabc2232d6fced
Author: Michael Adam <obnox at samba.org>
Date: Sat Jan 17 16:18:02 2009 +0100
makerpms: fix detection of support for --rsyncable flag in gzip.
Michael
commit 145b85c948603cf977a5c5b53d9d9f63fbdba221
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 14:01:37 2009 +0100
ctdb.init: fix typo
Michael
commit 5fe84f96f3f79baba1f44ba57ce217f501b3c1f8
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 13:33:13 2009 +0100
events 50.samba: also support suse and ubuntu/debain systems
for managing samba and winbind
This uses CTDB_INIT_STYLE as exported by ctdb.init.
suse systems usually have separate init scripts for
smb for smbd and nmb for nmbd, and the ubuntu/debian
start script for smbd and nmbd is called samba instead
of smb (on redhat).
Michael
commit 4cac2a16b70be772e4f1520020762f63c0bf3efe
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 13:31:02 2009 +0100
funcions: make (nice_)service a noop for empty service name
Michael
commit 56a10594ea9e44e3f034ac11161fd06e5ae46544
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 13:28:19 2009 +0100
ctdb.init: use detect_init_style() in the init script
and export CTDB_INIT_STYLE, so that event scripts
as called by ctdbd can use it.
Michael
commit ab34a9480b59c649a4fc73a466c8ca0975453ed9
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 13:26:57 2009 +0100
functions: add detect_init_style().
Michael
commit 73a7b611bf2ef87e92d6b18c538a260aa988a2e5
Author: root <root at rcn1.VSOFS1.COM>
Date: Fri Jan 16 10:13:53 2009 +1100
new version
commit 22cafa88f59ebe50c11f5b65a414800db79405a9
Author: Michael Adam <obnox at samba.org>
Date: Fri Dec 19 11:50:06 2008 +0100
ctdb.init: add $network to RequiredStop to match RequiredStart.
This is to make rpm checks (eg.g for SuSE systems) survive.
Michael
commit 02893e04154c0590b235082c5a6e5726ceb25dba
Author: Andreas Schneider <anschneider at suse.de>
Date: Wed Oct 29 14:12:04 2008 +0100
Fix circular dependency error with autoconf 2.6.3.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
(cherry picked from commit b39611c36bb904774fd4032bf2f8003fbdeb5d34)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 62eccefc15e2ca737098980aa0b7d226df73a456
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 16:01:49 2008 +0100
makerpms: fix creation of tarball when gzip does not know "--rsynceable"
--rsynceable is a patch to gzip that not all distributors / packagers
add to gzip. (It has just bitten me on openSUSE.) This path first detects
whether gzip knows about --rsynceable and then calls gzip accordingly.
Michael
commit a98a3ff2aad59d51fca6a2f3e2bdcfc99e84fa70
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:18:09 2008 +0100
ctdb.spec: fix version and (RPM-)release number.
Originally, 1.0 was the version in the spec file and 68 was the release.
But in fact everyone talked about ctdb version 1.0.68.
This puts this straight...
Michael
commit 826511f759c3bfa7c587c97786b955572039d2ac
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:17:15 2008 +0100
makerpms: confess
Michael
commit 32eac6fc3cce2a9d0a38add56a8bb893e4a85076
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:15:34 2008 +0100
makerpms: don't hard-code the version number but extract it from ctdb.spec
Michael
commit cf1e46d734ed51b4ac2eb8a09f2f787ae5c51092
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:13:42 2008 +0100
makerpms: remove the need of calling makerpms.sh from the top level directory
Instead, extract needed information from the dirname of the invoked name.
Michael
commit 25dbefc92e7303a7b679a769eb06a7c25fdcf198
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:12:17 2008 +0100
makerpms: don't cd to $SPECDIR but rpmbuild -ba $SPECDIR/$SPECFILE instead
Michael
commit 85e942a26f5e7d4584d31005ff88c36dca215a11
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:09:13 2008 +0100
makerpms: catch error of git archive correctly (echo resets $?)
Michael
commit ef4caf6874436ff3f451b95586893e39a8cec1ad
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:06:25 2008 +0100
makerpms: move comment to appropriate place
Michael
commit 9661b7a4f3773d645d0525c4430e3cccf0f32eb5
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 12:05:05 2008 +0100
makerpms: use variable (SPECFILE) that is available instead of hard coded file name
Michael
commit b7290b0a8325021515a904ac60fa9afa019c9db1
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 16 00:30:55 2008 +0100
doc: join broken lines in excerpt from log.ctdb
Michael
commit cdea4893c24511ffc1a7338ca3eb6cfd86d68086
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 16 00:17:04 2008 +0100
ctdb.samba.org: fix instruction for turning off samba service autostart
Extend to show valid commands on Redhat and SuSE Linux.
Michael
commit 4777b74b1e2eebe54cf27f3303f60e49023e7f6a
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Jan 16 15:50:33 2009 +1100
Make message in 62_ctdb_persistent_unsafe.sh more informative.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 03dfcf9f284c9926479a8dd4e5acf1f5d2b964aa
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Jan 16 15:12:40 2009 +1100
23_ctdb_moveip.sh sanity checks the list of IPs/nodes instead of
looping forever on older versions of CTDB.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 4928718a346f086f1683c78d52b0bf009c1150a3
Merge: 80dc86320dde7cc81db8c8fde97cfcbac7914920 3b88f3dec5227e8579672974f7028fb356ee1d94
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Jan 16 14:19:55 2009 +1100
Merge commit 'origin/master' into martins
commit 80dc86320dde7cc81db8c8fde97cfcbac7914920
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Jan 16 14:17:04 2009 +1100
Git should ignore the test_trigger event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 3b88f3dec5227e8579672974f7028fb356ee1d94
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jan 15 13:20:33 2009 +0100
Fix segfault in ip takeover fallback code.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
commit 4b97bdba3bc4df20efb1aae7d89a1e3430d35ca3
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Jan 13 17:02:59 2009 +1100
Remove the sorts from 06_ctdb_getpid.sh - the PIDs should be listed in
node order.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 2912c1ade5db1e20bfa3a8017a702cc8a7da36f1
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Jan 13 14:55:31 2009 +1100
Use $CTDB_TEST_WRAPPER in other tests that need it.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 44ec4c57bf9928ef5d5cc117a6c2d92495dac489
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Jan 13 14:51:40 2009 +1100
Use $CTDB_TEST_WRAPPER in 51_ctdb_bench.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 5cdbef46b74e6a5ba2383ef025e69fe605fa4f6e
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Jan 12 15:47:12 2009 +1100
For now, make tests/run_tests.sh runs the new test suite. Add
tests/TODO. Remove tests/start_daemons.sh - no longer used.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit a497010f67d6a8e68f4d6d7e516b88d2261b1062
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Jan 9 18:15:06 2009 +1100
Test binaries now go in tests/bin and ctdb_test_env now adds this
directory to $PATH if local daemons are being used.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 3ecce31d3a3f72b9fa851ac99291865c119e551e
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Jan 9 17:52:38 2009 +1100
Add tests/README. ctdb_test_env and, therefore, run_tests can now be
run from the tests subdirectory... and most other sensible places.
Rename $CTDB_TEST_REMOTE_SCRIPTS_DIR to $CTDB_TEST_REMOTE_DIR since it
is now intented that this directory can contain test binaries too.
daemons_start() now passes a full path to the events.d directory when
starting ctdbd. Also fixed the path to ctdbd. 41_ctdb_ban.sh and
42_ctdb_unban.sh fail immediately if they fail to select a test node.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 928c30213fb9f0c32d82995892ccdd8e054c9d6e
Merge: 33cdf3e4bcfadf8e20822ca352babf7acca16821 fd85e53794ef7fe24c51c94534370545a0711bd4
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Jan 8 17:28:09 2009 +1100
Merge commit 'origin/master' into martins
commit 33cdf3e4bcfadf8e20822ca352babf7acca16821
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Jan 8 17:12:03 2009 +1100
Delete some unstructured tests ({fetch,peristent,transaction}.sh) and
replace them with new simple tests (52_ctdb_fetch.sh,
53_ctdb_transaction.sh, 61_ctdb_persistent_safe.sh,
62_ctdb_persistent_unsafe.sh). Remove "_simple" from some test
filenames in the simple subdirectory - that's redundant. Always run
ctdb as $CTDB to allow $VALGRIND magic to be used. Use pgrep/pkill to
detect/kill local daemons so those running under valgrind can be found
too - to support this, always run local daemons with the full path to
the executable. run_tests now supports -s option to print sumamry
when done - with more and more tests, it is getting hard to follow
progress. Sort the output of commands in 06_ctdb_getpid.sh to make
sure they compare nicely and also allow the processes' executables to
be called "memcheck" to catch those running under valgrind. Remove
redundant calls to onnode in commands run from calls
try_command_on_node in some tests. 41_ctdb_ban.sh and
42_ctdb_unban.sh avoid banning the recmaster, since this causes the
recmaster to be reassigned and all nodes to be unbanned. Minor
cleanups.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 486ed3b5b483f1c12c2d978ec6564bd33a2c6aee
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Dec 18 14:25:07 2008 +1100
Remove old ctdbd.sh test script. Remove unneeded nodes.txt and
public_addresses files - these are now created in tests/var as needed.
09_ctdb_ping.sh now recognises new "node disconnected" message.
Replace custom recovery detection code (which could not have been
working) with a call to "ctdb recover" in 32_ctdb_enable_simple.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit e627f8e5fe8e2e3ea423b7dbd12d74597fb4983b
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Dec 18 11:28:43 2008 +1100
Remove bench.sh test and replace with new test 51_ctdb_bench.sh.
Function try_command_on_node node passes any options other than -v to
onnode. Minor update to 14_ctdb_statistics.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 2c055831f0d56e42d055e1d72fb6f0db5f71def1
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Dec 18 09:45:49 2008 +1100
Bug fixes for ctdb_bench from Ronnie.
commit 33afe9bae732e62994e5957ee143a9c49571898b
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Dec 17 16:59:23 2008 +1100
ctdb_test_env now sets $CTDB_TIMEOUT. Fixed
26_ctdb_config_check_error_on_unreachable_ctdb.sh to work with new
generic error message when trying to talk to disconnected node.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 099a1605574c7a8d232fd4c2d0c65e55aedeafad
Merge: a99204ad8bd4d3b15c8219762442682a3d1285cf 7ee6db06162ad5a554058bb6160ad37b24fe42e0
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Dec 17 15:05:44 2008 +1100
Merge commit 'origin/master' into martins
commit a99204ad8bd4d3b15c8219762442682a3d1285cf
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Dec 16 17:32:34 2008 +1100
New test 26_ctdb_config_check_error_on_unreachable_ctdb.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit f5aeab0390b735291ee82359f50d508619211623
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Dec 16 17:22:22 2008 +1100
Finish 24_ctdb_getdbmap.sh. New test 25_dumpmemory.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit da61a9822f66ff227b8859bf15ba76fd9afb9d12
Merge: f90f6e19952d58b8590fe550ecf2308bd9b065dc 023d6c2e3017d323b5a70f987f3b4e0b8b8f0f7b
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Dec 16 11:21:55 2008 +1100
Merge commit 'origin/master' into martins
commit f90f6e19952d58b8590fe550ecf2308bd9b065dc
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Dec 15 17:52:12 2008 +1100
3 new tests. 24_ctdb_getdbmap.sh is only 1/2 implemented but does
something vaguely useful. ctdb_test_exit unsets $ctdb_test_exit_hook.
Fix bug in 17_ctdb_config_delete_ip.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit b7be3de004cb05dad05704096e2a75e128952b18
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Dec 12 18:44:21 2008 +1100
Add a recovery to ctdb_test_exit to improve test stability.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 497c40f69e06776861a780500da1952eb7ea8fc1
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Dec 12 17:25:38 2008 +1100
Rename $CTDB_NUM_NODES to $CTDB_TEST_NUM_DAEMONS and only set it if
$CTDB_TEST_REAL_CLUSTER is not set. After a ctdb restart, force a
recovery to attempt to help tests that follows.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 4c5eb616f041e4a10d8f8b3251fc3db5a58e726f
Merge: 2a069118fee169460bdf68b9a639b0e96ac85266 e50c9667b86160eb5dfb9868aff420b72f799a5f
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Dec 12 15:39:53 2008 +1100
Merge commit 'origin/master' into martins
commit 2a069118fee169460bdf68b9a639b0e96ac85266
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Dec 11 18:14:17 2008 +1100
Add message about restart to 18_ctdb_freeze.sh.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 86807e8b7b179cbe87e559fb3b1f02c8b1990dc4
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Dec 10 16:13:42 2008 +1100
With local daemons the sockets are now numbered starting from 0. Fix
setup of local daemons so that it correctly assigns no public IPs to a
single node each time. Separate out daemon_setup so that the
selection of the node with no public IPs is only done once at the
beginning of testing. Clean up all current tests, mostly with a view
to ensuring that a node selected for testing some kind of failover
actually has public addresses assigned. Reenabled 01_ctdb_version.sh
- it now passes if rpm doesn't do anything useful on the node.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 674d1660e5602f2fab1eaf219a6b8b5ddf24c402
Merge: b5eec91bd185c91a09b3f42ed26fee7b13a70d9d 8a0df9324a03b0f17772c64a9331236126c22124
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Dec 10 11:42:02 2008 +1100
Merge commit 'origin/master' into martins
commit b5eec91bd185c91a09b3f42ed26fee7b13a70d9d
Merge: 6cbe8923ead8226de1c20cfd8718e43fe8525ce1 c404d57afb2adda039e676877838927d3073df11
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Dec 10 11:32:24 2008 +1100
Merge commit 'origin/master' into martins
commit 6cbe8923ead8226de1c20cfd8718e43fe8525ce1
Merge: 23bffef2295772f5b795236d60b7fb6ea754b7fb 993f626e603b9bbc02942bb55096d63b9a4f456b
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Dec 10 11:22:59 2008 +1100
Merge commit 'origin/master' into martins
commit 23bffef2295772f5b795236d60b7fb6ea754b7fb
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Dec 9 18:20:11 2008 +1100
Added use of $ctdb_test_exit_hook to function ctdb_test_exit. Removed
sleeps from ban/unban tests. Now expect "ctdb ping" to return false
if it fails, so made relevant change to 09_ctdb_ping.sh. New
functions install_eventscript and uninstall_eventscript. New
setup/cleanup tests 00_ctdb_install_eventscript.sh and
99_ctdb_uninstall_eventscript.sh. New test 21_ctdb_disablemonitor.sh,
which is incredibly complex.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit 2ecc701869c8bc2d823a8073453c6caf1575dc47
Merge: 1b00fe0bac36422d30be167a009c452058975a21 39c77371a2f995025a584691fe61af12dc6ed5d7
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Dec 9 11:46:34 2008 +1100
Merge commit 'origin/master' into martins
commit 1b00fe0bac36422d30be167a009c452058975a21
Merge: ec354d602d20700e6769deb798436d08256a49d5 7b41b518c3ffebf1712445a8c6242509dc798003
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Dec 8 17:03:50 2008 +1100
Merge commit 'origin/master' into martins
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
common/system_aix.c | 52 ---------------------------------
common/system_common.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++
common/system_linux.c | 51 --------------------------------
config/ctdb.sysconfig | 18 +++++++++++
config/events.d/50.samba | 24 +++++++-------
include/ctdb_private.h | 1 +
7 files changed, 104 insertions(+), 116 deletions(-)
create mode 100644 common/system_common.c
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 08f5bf4..2cacd99 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util
CTDB_COMMON_OBJ = common/ctdb_io.o common/ctdb_util.o \
common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o \
- lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@
+ lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ common/system_common.o
CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
diff --git a/common/system_aix.c b/common/system_aix.c
index d5ca477..5fe5413 100644
--- a/common/system_aix.c
+++ b/common/system_aix.c
@@ -67,23 +67,6 @@ int ctdb_sys_open_sending_socket(void)
#endif
/*
- uint16 checksum for n bytes
- */
-static uint32_t uint16_checksum(uint16_t *data, size_t n)
-{
- uint32_t sum=0;
- while (n>=2) {
- sum += (uint32_t)ntohs(*data);
- data++;
- n -= 2;
- }
- if (n == 1) {
- sum += (uint32_t)ntohs(*(uint8_t *)data);
- }
- return sum;
-}
-
-/*
simple TCP checksum - assumes data is multiple of 2 bytes long
*/
static uint16_t tcp_checksum(uint16_t *data, size_t n, struct ip *ip)
@@ -187,41 +170,6 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return 0;
}
-
-/*
- see if we currently have an interface with the given IP
-
- we try to bind to it, and if that fails then we don't have that IP
- on an interface
- */
-bool ctdb_sys_have_ip(ctdb_sock_addr *_addr)
-{
- int s;
- int ret;
- ctdb_sock_addr __addr = *_addr;
- ctdb_sock_addr *addr = &__addr;
-
- switch (addr->sa.sa_family) {
- case AF_INET:
- addr->ip.sin_port = 0;
- break;
- case AF_INET6:
- addr->ip6.sin6_port = 0;
- break;
- }
-
- s = socket(addr->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
- if (s == -1) {
- return false;
- }
- ret = bind(s, (struct sockaddr *)addr, sizeof(ctdb_sock_addr));
- close(s);
- return ret == 0;
-}
-
-
-
-
/* This function is used to open a raw socket to capture from
*/
int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
diff --git a/common/system_common.c b/common/system_common.c
new file mode 100644
index 0000000..9aa4620
--- /dev/null
+++ b/common/system_common.c
@@ -0,0 +1,72 @@
+/*
+ ctdb system specific code to manage raw sockets on linux
+
+ Copyright (C) Ronnie Sahlberg 2007
+ Copyright (C) Andrew Tridgell 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "system/network.h"
+
+/*
+ uint16 checksum for n bytes
+ */
+uint32_t uint16_checksum(uint16_t *data, size_t n)
+{
+ uint32_t sum=0;
+ while (n>=2) {
+ sum += (uint32_t)ntohs(*data);
+ data++;
+ n -= 2;
+ }
+ if (n == 1) {
+ sum += (uint32_t)ntohs(*(uint8_t *)data);
+ }
+ return sum;
+}
+
+/*
+ see if we currently have an interface with the given IP
+
+ we try to bind to it, and if that fails then we don't have that IP
+ on an interface
+ */
+bool ctdb_sys_have_ip(ctdb_sock_addr *_addr)
+{
+ int s;
+ int ret;
+ ctdb_sock_addr __addr = *_addr;
+ ctdb_sock_addr *addr = &__addr;
+
+ switch (addr->sa.sa_family) {
+ case AF_INET:
+ addr->ip.sin_port = 0;
+ break;
+ case AF_INET6:
+ addr->ip6.sin6_port = 0;
+ break;
+ }
+
+ s = socket(addr->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+ if (s == -1) {
+ return false;
+ }
+
+ ret = bind(s, (struct sockaddr *)addr, sizeof(ctdb_sock_addr));
+
+ close(s);
+ return ret == 0;
+}
diff --git a/common/system_linux.c b/common/system_linux.c
index 0d5ea63..a771e3b 100644
--- a/common/system_linux.c
+++ b/common/system_linux.c
@@ -35,23 +35,6 @@
#endif
/*
- uint16 checksum for n bytes
- */
-static uint32_t uint16_checksum(uint16_t *data, size_t n)
-{
- uint32_t sum=0;
- while (n>=2) {
- sum += (uint32_t)ntohs(*data);
- data++;
- n -= 2;
- }
- if (n == 1) {
- sum += (uint32_t)ntohs(*(uint8_t *)data);
- }
- return sum;
-}
-
-/*
calculate the tcp checksum for tcp over ipv6
*/
static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
@@ -404,40 +387,6 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return 0;
}
-
-/*
- see if we currently have an interface with the given IP
-
- we try to bind to it, and if that fails then we don't have that IP
- on an interface
-
- ifname, if non-NULL, will return the name of the interface this ip is tied to
- */
-bool ctdb_sys_have_ip(ctdb_sock_addr *_addr)
-{
- int s;
- int ret;
- ctdb_sock_addr __addr = *_addr;
- ctdb_sock_addr *addr = &__addr;
-
- switch (addr->sa.sa_family) {
- case AF_INET:
- addr->ip.sin_port = 0;
- break;
- case AF_INET6:
- addr->ip6.sin6_port = 0;
- break;
- }
- s = socket(addr->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
- if (s == -1) {
- return false;
- }
- ret = bind(s, (struct sockaddr *)addr, sizeof(ctdb_sock_addr));
-
- close(s);
- return ret == 0;
-}
-
/*
This function is used to open a raw socket to capture from
*/
diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index abb9ea7..c3b5f16 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -65,6 +65,24 @@
# should ctdb manage starting/stopping the NFS service
# CTDB_MANAGES_NFS=yes
+# should ctdb manage starting/stopping the Apache web server httpd?
+# CTDB_MANAGES_HTTPD
+
+# The init style (redhat/suse/ubuntu...) is usually auto-detected.
+# The names of init scripts of services managed by CTDB are set
+# based on the detected init style. You can override the init style
+# auto-detection here to explicitly use a scheme. This might be
+# useful when you have installed a packages (for instance samba
+# packages) with a different init script layout.
+# There is no default.
+# CTDB_INIT_STYLE=redhat
+
+# The following are specific Samba init scripts / services that you
+# can override from auto-detection.
+# There are no defaults.
+# CTDB_SERVICE_SMB=smb
+# CTDB_SERVICE_NMB=nmb
+# CTDB_SERVICE_WINBIND=winbind
# you may wish to raise the file descriptor limit for ctdb
# use a ulimit command here. ctdb needs one file descriptor per
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 3e7164a..e0e2ad7 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -11,25 +11,25 @@ detect_init_style
case $CTDB_INIT_STYLE in
suse)
- CTDB_SERVICE_SMB="smb"
- CTDB_SERVICE_NMB="nmb"
- CTDB_SERVICE_WINBIND="winbind"
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb}
+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
;;
ubuntu)
- CTDB_SERVICE_SMB="samba"
- CTDB_SERVICE_NMB=""
- CTDB_SERVICE_WINBIND="winbind"
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
;;
redhat)
- CTDB_SERVICE_SMB="smb"
- CTDB_SERVICE_NMB=""
- CTDB_SERVICE_WINBIND="winbind"
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
;;
*)
# should not happen, but for now use redhat style as default:
- CTDB_SERVICE_SMB="smb"
- CTDB_SERVICE_NMB=""
- CTDB_SERVICE_WINBIND="winbind"
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
;;
esac
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index b6f44de..cbd97d7 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1231,6 +1231,7 @@ int ctdb_ctrl_get_public_ipsv4(struct ctdb_context *ctdb,
/* from takeover/system.c */
+uint32_t uint16_checksum(uint16_t *data, size_t n);
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface);
bool ctdb_sys_have_ip(ctdb_sock_addr *addr);
int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
--
CTDB repository
More information about the samba-cvs
mailing list