[ovs-dev] [cfm 7/7] bond: Use CFM for slave status.

Ethan Jackson ethan at nicira.com
Fri May 20 22:45:17 UTC 2011


Here is an incremental.
---
 lib/bond.c           |    7 +++++--
 vswitchd/vswitch.xml |    4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/bond.c b/lib/bond.c
index 409fe7a..bab3c08 100644
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -65,7 +65,7 @@ struct bond_slave {
     long long delay_expires;    /* Time after which 'enabled' may change. */
     bool up;                    /* Last link status read from netdev. */
     bool enabled;               /* May be chosen for flows? */
-    bool may_enable;            /* LACP considers this interface bondable. */
+    bool may_enable;            /* Client considers this slave bondable. */
     tag_type tag;               /* Tag associated with this slave. */
 
     /* Rebalancing info.  Used only by bond_rebalance(). */
@@ -457,7 +457,10 @@ bond_slave_unregister(struct bond *bond, const void *slave_)
 }
 
 /* Should be called on each slave in 'bond' before bond_run() to indicate
- * whether or not 'slave_' may be enabled. */
+ * whether or not 'slave_' may be enabled. This function is intended to allow
+ * other protocols to have some impact on bonding decisions.  For example LACP
+ * or high level link monitoring protocols may decide that a given slave should
+ * not be able to send traffic. */
 void
 bond_slave_set_may_enable(struct bond *bond, void *slave_, bool may_enable)
 {
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 2148646..85bf162 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1293,7 +1293,9 @@
 
       <column name="cfm_fault">
         Indicates a connectivity fault triggered by an inability to receive
-        heartbeats from the remote endpoint.
+        heartbeats from the remote endpoint.  When a fault is triggered on
+        <ref table="Interface"/>s participating in bonds, they will be
+        disabled.
       </column>
     </group>
 
-- 
1.7.4.4




More information about the dev mailing list