Rev 579: - merge from ronnie in http://samba.org/~tridge/ctdb
tridge at samba.org
tridge at samba.org
Fri Jul 13 01:31:19 GMT 2007
------------------------------------------------------------
revno: 579
revision-id: tridge at samba.org-20070713013118-tc4gxjsqihdzepir
parent: tridge at samba.org-20070712233546-55koeemyx8o2m60t
parent: sahlberg at ronnie-20070712014330-de69aa5ybstd6eik
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Fri 2007-07-13 11:31:18 +1000
message:
- merge from ronnie
- cleaner handling of system capture socket
modified:
client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3
common/system.c system.c-20070525071636-a5n1ihghjtppy08r-3
config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
doc/ctdbd.1 ctdbd.1-20070610004249-06awdka4n3gyea3w-1
doc/ctdbd.1.html ctdbd.1.html-20070610004253-y2xxgjfgnpsucekc-1
include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
server/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
server/ctdb_server.c ctdb.c-20061127094323-t50f58d65iaao5of-2
server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
------------------------------------------------------------
revno: 432.1.136
merged: sahlberg at ronnie-20070712014330-de69aa5ybstd6eik
parent: sahlberg at ronnie-20070712013120-n7ufqbaimrvrorn0
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Thu 2007-07-12 11:43:30 +1000
message:
netinet/if_ether.h is more portable than net/ethernet.h
------------------------------------------------------------
revno: 432.1.135
merged: sahlberg at ronnie-20070712013120-n7ufqbaimrvrorn0
parent: sahlberg at ronnie-20070711232206-6pm3mecz01impq86
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Thu 2007-07-12 11:31:20 +1000
message:
the posix.4 name for the priority field is sched_priority
not __sched_priority
------------------------------------------------------------
revno: 432.1.134
merged: sahlberg at ronnie-20070711232206-6pm3mecz01impq86
parent: sahlberg at ronnie-20070711225224-qbyzgimqeyf966qy
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Thu 2007-07-12 09:22:06 +1000
message:
as an optimization for when we want to send multiple tickles at a time
let the caller create the sending socket and use a single socket instead
of one new one for each tickle.
pass a sending socket to ctdb_sys_send_tcp()
ctdb_sys_kill_tcp is not longer used so remove it
set the socketflags for close on exec and nonblocking in the helper that
creates the sockets instead of in the caller
add a helper to create a sending socket to send tickles from
------------------------------------------------------------
revno: 432.1.133
merged: sahlberg at ronnie-20070711225224-qbyzgimqeyf966qy
parent: sahlberg at ronnie-20070711223156-ril1k1m9lcpgzxkf
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Thu 2007-07-12 08:52:24 +1000
message:
rename killtcp->fd to killtcp->capture_fd
we might want to have two sockets attached to the killtcp structure
one for capturing and a second one for sending so we dont have to
create a new socket for each tickle we want to send
------------------------------------------------------------
revno: 432.1.132
merged: sahlberg at ronnie-20070711223156-ril1k1m9lcpgzxkf
parent: sahlberg at ronnie-20070711223004-pbwpnkfz74lul1r6
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Thu 2007-07-12 08:31:56 +1000
message:
ctdb killtcp no longer takes a <numrst> argument to control how many
times to try the reset.
the reset retry attempt is now handled inside the daemon
update the 60.nfs script and remove this parameter that is no longer
used
------------------------------------------------------------
revno: 432.1.131
merged: sahlberg at ronnie-20070711223004-pbwpnkfz74lul1r6
parent: sahlberg at ronnie-20070711082425-1zfbn1iyzbfbclfs
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Thu 2007-07-12 08:30:04 +1000
message:
make the ctdb tool use the killtcp control in the daemon instead of
calling killtcp directly
------------------------------------------------------------
revno: 432.1.130
merged: sahlberg at ronnie-20070711082425-1zfbn1iyzbfbclfs
parent: sahlberg at ronnie-20070711081303-odjepxzg816tqy7s
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 18:24:25 +1000
message:
add daemon code for the new kill_tcp control
------------------------------------------------------------
revno: 432.1.129
merged: sahlberg at ronnie-20070711081303-odjepxzg816tqy7s
parent: sahlberg at ronnie-20070711074351-9d48j4yu8564oceo
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 18:13:03 +1000
message:
add a ctdb_ prefix to two public functions
------------------------------------------------------------
revno: 432.1.128
merged: sahlberg at ronnie-20070711074351-9d48j4yu8564oceo
parent: sahlberg at ronnie-20070711023314-htwqs78g0mixu8xo
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 17:43:51 +1000
message:
first cut at a better and more scalable socketkiller
that can kill multiple connections asynchronously using one listening
socket
------------------------------------------------------------
revno: 432.1.127
merged: sahlberg at ronnie-20070711023314-htwqs78g0mixu8xo
parent: sahlberg at ronnie-20070710234452-l9jra1t6u7qes11v
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 12:33:14 +1000
message:
add a ctdb_kill_tcp_callback() that will perform a kill tcp using a
background process
------------------------------------------------------------
revno: 432.1.126
merged: sahlberg at ronnie-20070710234452-l9jra1t6u7qes11v
parent: sahlberg at ronnie-20070710224129-y1jonwp1dc6p04yn
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 09:44:52 +1000
message:
pass the header to ctdb_become_dmaster instead of just the reqid
this allows us to print from which node Invalid or Dropped orphan become
dmaster packets came from
------------------------------------------------------------
revno: 432.1.125
merged: sahlberg at ronnie-20070710224129-y1jonwp1dc6p04yn
parent: sahlberg at ronnie-20070710222722-68ybzypf1n1k6hhw
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 08:41:29 +1000
message:
print the operation code in the debug message when we discard a packet
due to incorrect generation number
------------------------------------------------------------
revno: 432.1.124
merged: sahlberg at ronnie-20070710222722-68ybzypf1n1k6hhw
parent: sahlberg at ronnie-20070710090723-qx0cqemur7vvvs7p
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-07-11 08:27:22 +1000
message:
regenerated ctdbd manpage
------------------------------------------------------------
revno: 432.1.123
merged: sahlberg at ronnie-20070710090723-qx0cqemur7vvvs7p
parent: sahlberg at ronnie-20070710074504-siarf2uuqozgwko6
parent: tridge at samba.org-20070710081347-5jd8uwf5k5mhbv02
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Tue 2007-07-10 19:07:23 +1000
message:
merge from tridge
------------------------------------------------------------
revno: 432.1.122
merged: sahlberg at ronnie-20070710074504-siarf2uuqozgwko6
parent: sahlberg at ronnie-20070710030935-8vbusw2q37a1mm5g
parent: tridge at samba.org-20070710054605-cld6k4rlvr8eh7r7
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Tue 2007-07-10 17:45:04 +1000
message:
merge from tridge
Diff too large for email (1132, the limit is 200).
More information about the samba-cvs
mailing list