[ovs-dev] [PATCH 3/3] lacp: Implement custom timing mode.

Ethan Jackson ethan at nicira.com
Tue Apr 19 18:03:57 UTC 2011


Here is an incremental.

---
 lib/lacp.c           |    4 +++-
 vswitchd/vswitch.xml |   29 +++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/lib/lacp.c b/lib/lacp.c
index a3c1b8f..66049ef 100644
--- a/lib/lacp.c
+++ b/lib/lacp.c
@@ -190,7 +190,9 @@ lacp_configure(struct lacp *lacp, const struct lacp_settings *s)
 
     lacp->active = s->active;
     lacp->lacp_time = s->lacp_time;
-    lacp->custom_time = s->custom_time;
+    lacp->custom_time = (s->custom_time < TIME_UPDATE_INTERVAL
+                         ? TIME_UPDATE_INTERVAL
+                         : s->custom_time);
 }
 
 /* Returns true if 'lacp' is configured in active mode, false if 'lacp' is
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index c08c6d8..975156c 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -653,18 +653,23 @@
             with the numerically lower priority.  Must be a number between 1
             and 65535.</dd>
           <dt><code>lacp-time</code></dt>
-          <dd> The LACP timing which should be used on this
-            <ref table="Port"/>.  Possible values are <code>fast</code>,
-            <code>slow</code> and a positive number of milliseconds.  By
-            default <code>slow</code> is used.  When configured to be
-            <code>fast</code> more frequent LACP heartbeats will be requested
-            causing connectivity problems to be detected more quickly.  Users
-            may manually set a heartbeat transmission rate to increase the
-            fault detection speed further.  When manually set, OVS expects the
-            transmission rate to be configured the same on the partner
-            switch.  Manually setting <code>lacp-time</code> to something other
-            than <code>fast</code> or <code>slow</code> is not supported in the
-            LACP specification.</dd>
+          <dd>
+            <p>The LACP timing which should be used on this
+              <ref table="Port"/>.  Possible values are <code>fast</code>,
+              <code>slow</code> and a positive number of milliseconds.  By
+              default <code>slow</code> is used.  When configured to be
+              <code>fast</code> LACP heartbeats are requested at a rate of once
+              per second causing connectivity problems to be detected more
+              quickly.  In <code>slow</code> mode, heartbeats are requested at
+              a rate of once every 30 seconds.</p>
+
+            <p>Users may manually set a heartbeat transmission rate to increase
+              the fault detection speed further.  When manually set, OVS
+              expects the partner switch to be configured with the same
+              transmission rate.  Manually setting <code>lacp-time</code> to
+              something other than <code>fast</code> or <code>slow</code> is
+              not supported by the LACP specification.</p>
+          </dd>
           <dt><code>lacp-strict</code></dt>
           <dd> When <code>true</code>, configures this <ref table="Port"/> to
             require successful LACP negotiations to enable any slaves.
-- 
1.7.4.2




More information about the dev mailing list