bond: Change default bond_mode to active-backup.

As promised, post version 1.4 the default bond_mode is changing to
active-backup with this commit.

Signed-off-by: Ethan Jackson <ethan@nicira.com>

diff --git a/NEWS b/NEWS
index 4f29e19b4a0c1674fa25b125fe53c2a4d6ffe388..2249eae3bcecce59ce097dbe293407b12cce7307 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 post-v1.5.0
 ------------------------
+    - bonding
+        - 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 16daa3d87d1d8b10da627f5cc63e49e9004c4c0f..c10e05fcace436172620af89a42b723dc5906c10 100644 (file)
--- 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 799124bc2b12cfb20e225cfa16e18ce70eea319b..c40bcb5f1fe6f7f9c9ce4d05258208c75cf3cffd 100644 (file)
--- 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 585f6787d116d17f904d955e55013dc171d41068..f3226e925526a5f7bc55f43b01a5420d6d4f5324 100644 (file)
--- 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>