Rev 683: merge from ronnie in http://samba.org/~tridge/ctdb
tridge at samba.org
tridge at samba.org
Sun Dec 2 23:19:40 GMT 2007
------------------------------------------------------------
revno: 683
revision-id:tridge at samba.org-20071202231924-btpfcs8a4oyo221q
parent: tridge at samba.org-20071118041519-zln4c6dg2d3ymgyx
parent: sahlberg at ronnie-20071130230642-d1rjmxqtsxi412lj
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.stable
timestamp: Mon 2007-12-03 10:19:24 +1100
message:
merge from ronnie
modified:
client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
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_server.c ctdb.c-20061127094323-t50f58d65iaao5of-2
server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
tcp/tcp_connect.c tcp_connect.c-20061128004937-x70q1cu5xzg5g2tm-1
tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
------------------------------------------------------------
revno: 432.1.366
revision-id:sahlberg at ronnie-20071130230642-d1rjmxqtsxi412lj
parent: sahlberg at ronnie-20071129235335-301mbtb0wfq7hjv5
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Sat 2007-12-01 10:06:42 +1100
message:
up the loglevel for the enable/disable monitoring to level 1
modified:
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
------------------------------------------------------------
revno: 432.1.365
revision-id:sahlberg at ronnie-20071129235335-301mbtb0wfq7hjv5
parent: sahlberg at ronnie-20071129231443-fdev319wh3cdmips
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-30 10:53:35 +1100
message:
log that monitoring has been "disabled" not that it has been "stopped"
when monitoring is disabled
modified:
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
------------------------------------------------------------
revno: 432.1.364
revision-id:sahlberg at ronnie-20071129231443-fdev319wh3cdmips
parent: sahlberg at ronnie-20071129230954-1joeb0lz7nl1jrim
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-30 10:14:43 +1100
message:
always set up a new monitoring event regardless of whether monitoring is
enabled or not
modified:
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
------------------------------------------------------------
revno: 432.1.363
revision-id:sahlberg at ronnie-20071129230954-1joeb0lz7nl1jrim
parent: sahlberg at ronnie-20071129230004-3w0t5d94zeghysh8
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-30 10:09:54 +1100
message:
add ctdb_disable/enable_monitoring() that only modifies the monitoring
flag.
change calling of the recovered/takeip/releaseip event scripts to use
these enable/disable functions instead of stopping/starting monitoring.
when we disable monitoring we want all events to still be running
in particular the events to monitor for dead nodes and we only want to
supress running the monitor event scripts
modified:
include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
server/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
------------------------------------------------------------
revno: 432.1.362
revision-id:sahlberg at ronnie-20071129230004-3w0t5d94zeghysh8
parent: sahlberg at ronnie-20071129220237-4l2j2ogpwfws10bn
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-30 10:00:04 +1100
message:
get rid of the control to set the monitoring mode.
monitoring should always be enabled
(though a node may want to temporarily disable running the "monitor"
event scripts but can do so internally without the need for this
control)
modified:
client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
------------------------------------------------------------
revno: 432.1.361
revision-id:sahlberg at ronnie-20071129220237-4l2j2ogpwfws10bn
parent: sahlberg at ronnie-20071129214434-0x9f3ji1q61wvq16
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-30 09:02:37 +1100
message:
->monitor_context is NULL when monitoring is disabled.
Check whether monitoring is enabled or not before creating new events
and log why the event is not set up othervise
modified:
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
------------------------------------------------------------
revno: 432.1.360
revision-id:sahlberg at ronnie-20071129214434-0x9f3ji1q61wvq16
parent: sahlberg at ronnie-20071128040420-3cb8vogap72g7stw
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-30 08:44:34 +1100
message:
dont manipulate ctdb->monitoring_mode directly from the SET_MON_MODE
control, instead call ctdb_start/stop_monitoring()
ctdb_stop_monitoring() dont allocate a new monitoring context, leave it
NULL. Also set the monitoring_mode in this function so that
ctdb_stop/start_monitoring() and ->monitoring_mode are kept in sync.
Add a debug message to log that we have stopped monitoring.
ctdb_start_monitoring() check whether monitoring is already active and
make the function idempotent.
Create the monitoring context when monitoring is started.
Update ->monitoring_mode once the monitoring has been started.
Add a debug message to log that we have started monitoring.
When we temporarily stop monitoring while running an event script,
restart monitoring after the event script wrapper returns instead of in
the event script callback.
Let monitoring_mode start out as DISABLED and let it be enabled once we call ctdb_start_monitoring.
dont check for MONITORING_DISABLED in check_fore_dead_nodes(). If
monitoring is disabled, this event handler will not be called.
modified:
server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
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
server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
------------------------------------------------------------
revno: 432.1.359
revision-id:sahlberg at ronnie-20071128040420-3cb8vogap72g7stw
parent: sahlberg at ronnie-20071125235255-d35zhk6u4egwkm9p
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Wed 2007-11-28 15:04:20 +1100
message:
move ctdb_set_culprit higher up in the file
when we are the recmaster and we update the local flags for all the
nodes, if one of the nodes fail to respond and give us his flags,
set that node as a "culprit"
as one of the first things to do in the monitor_cluster loop, check if
the current culprit has caused too many (20) failures and if so ban that
node.
this is for the situation where a remote node may still be CONNECTED but
it fails to respond to the getnodemap control causing the recovery
master to loop in monitor_cluster aborting the monitoring when the
node fails to respond but before anything will trigger a call to
do_recovery().
If one or more of the databases or nodes are frozen at this stage, this
would lead to smbd being blocked for potentially a longish time.
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.358
revision-id:sahlberg at ronnie-20071125235255-d35zhk6u4egwkm9p
parent: sahlberg at ronnie-20071123014129-ze323geqqvd00sov
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Mon 2007-11-26 10:52:55 +1100
message:
Add a --node-ip argument so that one can specify which ip address a
specific instance of ctdbd should bind to. This helps when running a
"virtual" cluster on a single machine where all instcances bind to
different alias interfaces.
If --node-ip is specified, then we will only try to bind to this ip
address only. Othervise we fall back to the original method trying the
ip addresses in /etc/ctdb/nodes one by one until we find one we can bind
to.
No variable in /etc/sysconfig/ctdb added since this parameter only makes
sense in a virtual test/debug cluster.
modified:
include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
server/ctdb_server.c ctdb.c-20061127094323-t50f58d65iaao5of-2
server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
tcp/tcp_connect.c tcp_connect.c-20061128004937-x70q1cu5xzg5g2tm-1
------------------------------------------------------------
revno: 432.1.357
revision-id:sahlberg at ronnie-20071123014129-ze323geqqvd00sov
parent: sahlberg at ronnie-20071123013837-vkx1iiq1pfgf48h1
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 12:41:29 +1100
message:
when monitoring the node from the recovery daemon, check that the
recovery daemon and the ctdb daemon both agree on whether the node is
banned or not and if they disagree then reban the node again after
logging an error to the debug log
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.356
revision-id:sahlberg at ronnie-20071123013837-vkx1iiq1pfgf48h1
parent: sahlberg at ronnie-20071123013614-twa4onckjtlbd5hn
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 12:38:37 +1100
message:
check for recursive bans in ctdb_ban_node() and remove the previous ban
if this is an attempt to ban an already banned node
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.355
revision-id:sahlberg at ronnie-20071123013614-twa4onckjtlbd5hn
parent: sahlberg at ronnie-20071123005306-727eumzw6bhaqzc1
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 12:36:14 +1100
message:
add log output for when ctdb_ban_node() and ctdb_unban_node() are called
when these functions are called to ban or unban a node make sure we
update the CTDB_NODE_BANNED flag in rec->node_flags since this field and
flag are checked during the election process
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.354
revision-id:sahlberg at ronnie-20071123005306-727eumzw6bhaqzc1
parent: sahlberg at ronnie-20071123003142-r1b9z3ixjewaxs4d
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 11:53:06 +1100
message:
If update_local_flags() finds that a node has changed its BANNED status
so it differs from what the local ctdb daemon on the recovery master
thinks it should be we should call for a re-election
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.353
revision-id:sahlberg at ronnie-20071123003142-r1b9z3ixjewaxs4d
parent: sahlberg at ronnie-20071122235229-qa11u8u3stp8utja
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 11:31:42 +1100
message:
when we as the recovery daemon on the recovery master detects that the
flags differ between the local ctdb daemon and the remote node
we can force a flags update on all nodes and not just the local daemon
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.352
revision-id:sahlberg at ronnie-20071122235229-qa11u8u3stp8utja
parent: sahlberg at ronnie-20071122233151-guh6boix1xu7sg8g
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 10:52:29 +1100
message:
add an extra log if we get a modflags control but it doesnt change any
flags
in update_local_flags()
(this is only called if we are or we belive we are the recmaster)
when we detect that the flags of a remote node is different from what
our local node thinks the flags should be for that remote node
we should send a node-flag-changed message to the local daemon so
that it updates the flags for that node.
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.351
revision-id:sahlberg at ronnie-20071122233151-guh6boix1xu7sg8g
parent: sahlberg at ronnie-20071122225438-6ot1neasjdl3psbv
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 10:31:51 +1100
message:
if we get a modflag control but the flags remain unchanged, log this
modified:
server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
------------------------------------------------------------
revno: 432.1.350
revision-id:sahlberg at ronnie-20071122225438-6ot1neasjdl3psbv
parent: sahlberg at ronnie-20071122225141-vafy5h1ltvpenoaz
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 09:54:38 +1100
message:
when we print "Remote node had flags xx local had flags xx
we swapped the flags when printing them to the log
modified:
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
------------------------------------------------------------
revno: 432.1.349
revision-id:sahlberg at ronnie-20071122225141-vafy5h1ltvpenoaz
parent: sahlberg at ronnie-20071116023727-gcy4lvutf8p3gskl
parent: tridge at samba.org-20071118041519-zln4c6dg2d3ymgyx
committer: Ronnie Sahlberg <sahlberg at ronnie>
branch nick: ctdb
timestamp: Fri 2007-11-23 09:51:41 +1100
message:
merge from tridge
added:
tests/public_addresses public_addresses-20071112234600-aundzf1z9dczqk7y-1
modified:
config/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3
packaging/RPM/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3
web/samba.html samba.html-20070608233143-cblz5ezz3qu11089-1
Diff too large for email (728, the limit is 200).
More information about the samba-cvs
mailing list