------------------------------------------------------------
revno: 658
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Thu 2007-10-18 15:51:15 +1000
message:
merge from ronnie
modified:
config/events.d/90.ipmux 90.ipmux-20071008021847-vxcv0xkqd7kbgsez-1
tools/ctdb.c
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
utils/ipmux/ipmux.c ipmux.c-20071008000130-dli3s00uaraama1y-2
------------------------------------------------------------
revno: 432.1.321
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Thu 2007-10-18 14:13:48 +1000
message:
flush the route cache when we have added the single public ip to the
node
cleanup and remove everything when we do a shutdown event
modified:
config/events.d/90.ipmux 90.ipmux-20071008021847-vxcv0xkqd7kbgsez-1
------------------------------------------------------------
revno: 432.1.320
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Wed 2007-10-17 15:03:58 +1000
message:
use NF_DROP instead of NF_STOLEN when we tell the kernel to not worry
about this packet any more and just forget it ever saw it
modified:
utils/ipmux/ipmux.c ipmux.c-20071008000130-dli3s00uaraama1y-2
------------------------------------------------------------
revno: 432.1.319
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Wed 2007-10-17 13:42:42 +1000
message:
reverse the order in which public ips are listed so it matches the order
of the public_addresses file
modified:
tools/ctdb.c
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
------------------------------------------------------------
revno: 432.1.318
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Wed 2007-10-17 10:10:52 +1000
message:
merge from tridge
modified:
packaging/RPM/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3
tools/ctdb_diagnostics
ctdb_diagnostics-20070905041904-9d9r1qnt1j9qiwiz-1
=== modified file 'config/events.d/90.ipmux'
--- a/config/events.d/90.ipmux 2007-10-10 21:51:57 +0000
+++ b/config/events.d/90.ipmux 2007-10-18 04:13:48 +0000
@@ -22,6 +22,17 @@
;;
shutdown)
+ # remove the ip
+ ip addr del $CTDB_SINGLE_PUBLIC_IP/32 dev lo >/dev/null 2>/dev/null
+
+ # remove any iptables rules
+ /sbin/iptables -D INPUT -i $CTDB_PUBLIC_INTERFACE -d
$CTDB_SINGLE_PUBLIC_IP -j DROP 2> /dev/null
+
+ # kill off any ipmux processes
+ killall -9 ctdb_ipmux >/dev/null 2>/dev/null
+
+ # flush our route cache
+ echo 1 > /proc/sys/net/ipv4/route/flush
;;
takeip)
@@ -63,6 +74,9 @@
iptables -I INPUT 1 -d $CTDB_SINGLE_PUBLIC_IP -i $CTDB_PUBLIC_INTERFACE
-j QUEUE >/dev/null 2>/dev/null
ctdb_ipmux &
+
+ # flush our route cache
+ echo 1 > /proc/sys/net/ipv4/route/flush
;;
monitor)
=== modified file 'tools/ctdb.c'
--- a/tools/ctdb.c 2007-10-09 01:56:09 +0000
+++ b/tools/ctdb.c 2007-10-17 03:42:42 +0000
@@ -571,8 +571,8 @@
printf("Public IPs on node %u\n", options.pnn);
}
- for (i=0;i<ips->num;i++) {
- printf("%s %d\n", inet_ntoa(ips->ips[i].sin.sin_addr),
ips->ips[i].pnn);
+ for (i=1;i<=ips->num;i++) {
+ printf("%s %d\n", inet_ntoa(ips->ips[ips->num-i].sin.sin_addr),
ips->ips[ips->num-i].pnn);
}
talloc_free(tmp_ctx);
=== modified file 'utils/ipmux/ipmux.c'
--- a/utils/ipmux/ipmux.c 2007-10-15 04:37:54 +0000
+++ b/utils/ipmux/ipmux.c 2007-10-17 05:03:58 +0000
@@ -223,7 +223,7 @@
about this packet any more
*/
ret = sendto(s, &ipqp->payload[0], ipqp->data_len, 0,
&ipmux_nodes[hash].sin, sizeof(struct sockaddr_in));
- ipq_set_verdict(ipqh, ipqp->packet_id, NF_STOLEN, 0, pktbuf);
+ ipq_set_verdict(ipqh, ipqp->packet_id, NF_DROP, 0, pktbuf);
}
