Rev 685: merge from ronnie in http://samba.org/~tridge/ctdb
tridge at samba.org
tridge at samba.org
Tue Dec 4 04:20:41 GMT 2007
------------------------------------------------------------
revno: 685
revision-id:tridge at samba.org-20071204042040-8ih81hoipueakyu9
parent: tridge at samba.org-20071204041827-qk47nxxpbhhoo7cm
parent: sahlberg at ronnie-20071203044553-qkn87ec0fm39vhf1
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.stable
timestamp: Tue 2007-12-04 15:20:40 +1100
message:
merge from ronnie
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
------------------------------------------------------------
revno: 432.1.369
revision-id:sahlberg at ronnie-20071203044553-qkn87ec0fm39vhf1
parent: sahlberg at ronnie-20071203003917-m7uq2euljw4a7jcn
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Mon 2007-12-03 15:45:53 +1100
message:
rework banning/unbanning nodes
ctdb_recoverd.c
Always handle banning/unbanning locally on the node that is being
banned/unbanned instead of on the recovery master.
This means that if a ban request comes in to the recovery master for a
remote node, we pass the request on to the remote node instead of
setting up the ban and ban timeouts locally.
ctdb.c
send ban/unban requests to the node being banned/unbanned instead of to
the recmaster
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
------------------------------------------------------------
revno: 432.1.368
revision-id:sahlberg at ronnie-20071203003917-m7uq2euljw4a7jcn
parent: sahlberg at ronnie-20071202232145-avvdc9c6caa0inih
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Mon 2007-12-03 11:39:17 +1100
message:
for the banned status, we should allocate this structure as a child of
the banned_nodes array and not the rec structure so that ban_state is
destroyed when the banned_nodes array gets destroyed
(and so that when this struct is destroyed, that any pending
ctdb_ban_timeout events are also destroyed.)
othervise we may end up with multiple ban_timeout timed events going in
parallell since we destroy/recreate the banned_nodes structure during
election but we never destroy/recreate the rec structure.
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.367
revision-id:sahlberg at ronnie-20071202232145-avvdc9c6caa0inih
parent: sahlberg at ronnie-20071130230642-d1rjmxqtsxi412lj
parent: tridge at samba.org-20071202231924-btpfcs8a4oyo221q
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Mon 2007-12-03 10:21:45 +1100
message:
merge from tridge
modified:
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
server/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
Diff too large for email (269, the limit is 200).
More information about the samba-cvs
mailing list