Looks good to me.
On Fri, Jan 13, 2012 at 12:03:30PM -0800, Ethan Jackson wrote:
> Here's a version which incorporates your suggestions.
>
> ---
> As promised, post version 1.4 the default bond_mode is changing to
> active-backup with this commit.
>
> Signed-off-by: Ethan Jackson <et...@nicira.com>
> ---
> NEWS | 3 +++
> tests/lacp.at | 1 -
> vswitchd/bridge.c | 10 +++++-----
> vswitchd/vswitch.xml | 2 +-
> 4 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/NEWS b/NEWS
> index 8ff87c4..913d41a 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -3,6 +3,9 @@ post-v1.5.0
> - bonding
> - LACP bonds no longer fall back to balance-slb when negotiations
> fail.
> Instead they drop traffic.
> + - The default bond_mode changed from SLB to active-backup, to protect
> + unsuspecting users from the significant risks of SLB bonds (which
> are
> + documented in vswitchd/INTERNALS).
>
>
> v1.5.0 - xx xxx xxxx
> diff --git a/tests/lacp.at b/tests/lacp.at
> index 947eb9c..543aa25 100644
> --- a/tests/lacp.at
> +++ b/tests/lacp.at
> @@ -40,7 +40,6 @@ AT_SETUP([lacp - multi port config])
> OVS_VSWITCHD_START([dnl
> add-bond br0 bond p1 p2 --\
> set Port bond lacp=active \
> - bond_mode=active-backup \
> other_config:lacp-time="fast" \
> other_config:lacp-system-id=11:22:33:44:55:66 \
> other_config:lacp-system-priority=54321 --\
> diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
> index 799124b..c40bcb5 100644
> --- a/vswitchd/bridge.c
> +++ b/vswitchd/bridge.c
> @@ -2746,7 +2746,7 @@ port_configure_bond(struct port *port, struct
> bond_settings *s,
> size_t i;
>
> s->name = port->name;
> - s->balance = BM_SLB;
> + s->balance = BM_AB;
> if (port->cfg->bond_mode) {
> if (!bond_mode_from_string(&s->balance, port->cfg->bond_mode)) {
> VLOG_WARN("port %s: unknown bond_mode %s, defaulting to %s",
> @@ -2756,11 +2756,11 @@ port_configure_bond(struct port *port, struct
> bond_settings *s,
> } else {
> static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
>
> - /* XXX: Post version 1.4.*, change the default bond_mode to
> - * active-backup. Until then, warn that the change is imminent. */
> + /* XXX: Post version 1.5.*, the default bond_mode changed from SLB to
> + * active-backup. At some point we should remove this warning. */
> VLOG_WARN_RL(&rl, "port %s: Using the default bond_mode %s. Note
> that"
> - " in future versions, the default bond_mode is expected"
> - " to change to active-backup", port->name,
> + " in previous versions, the default bond_mode was"
> + " balance-slb", port->name,
> bond_mode_to_string(s->balance));
> }
> if (s->balance == BM_SLB && port->bridge->cfg->n_flood_vlans) {
> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
> index dcc25d1..8c506e4 100644
> --- a/vswitchd/vswitch.xml
> +++ b/vswitchd/vswitch.xml
> @@ -789,7 +789,7 @@
>
> <column name="bond_mode">
> <p>The type of bonding used for a bonded port. Defaults to
> - <code>balance-slb</code> if unset.
> + <code>active-backup</code> if unset.
> </p>
> </column>
>
> --
> 1.7.7.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
