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/bond.at | 1 -
vswitchd/bridge.c | 11 +----------
vswitchd/vswitch.xml | 2 +-
4 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
index 1addec7..39c46d6 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@ post-v1.4.0
- bonding
- LACP bonds no longer fall back to balance-slb when negotiations
fail.
+ - The default bond_mode changed to active-backup from SLB. SLB bonds
+ carry significant risks with them (documented vswitchd/INTERNALS)
+ which we want to prevent unsuspecting users from running into.
v1.4.0 - xx xxx xxxx
------------------------
diff --git a/tests/bond.at b/tests/bond.at
index 7df11c3..1f5de1f 100644
--- a/tests/bond.at
+++ b/tests/bond.at
@@ -40,7 +40,6 @@ AT_SETUP([bond - multi port])
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 4614ea1..de24dc9 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -2746,22 +2746,13 @@ 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",
port->name, port->cfg->bond_mode,
bond_mode_to_string(s->balance));
}
- } 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. */
- 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,
- bond_mode_to_string(s->balance));
}
if (s->balance == BM_SLB && port->bridge->cfg->n_flood_vlans) {
VLOG_WARN("port %s: SLB bonds are incompatible with flood_vlans, "
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index e28b053..17a5590 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -790,7 +790,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
