bridge: Drop log message when a QoS record lacks a default queue.

Apparently we're planning to use this configuration regularly at Nicira.

Bug #7413.
Requested-by: Bryan Fulton <bryan@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 5b0f66f..6293dad 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3196,11 +3196,6 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos)
             shash_destroy(&details);
         }
         if (!queue_zero) {
-            static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
-            VLOG_WARN_RL(&rl, "interface %s: QoS configured without a default "
-                         "queue (queue 0).  Using default configuration.",
-                         iface->name);
-
             shash_init(&details);
             netdev_set_queue(iface->netdev, 0, &details);
             shash_destroy(&details);

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index cd50f55..06edb76 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -2061,9 +2061,11 @@
 
       <p>
         Queue 0 is the ``default queue.''  It is used by OpenFlow output
-        actions when no specific queue has been set.  Ordinarily <ref
-        column="queues"/> should include a configuration for queue 0.  When no
-        configuration for queue 0 is present, a default configuration is used.
+        actions when no specific queue has been set.  When no configuration for
+        queue 0 is present, it is automatically configured as if a <ref
+        table="Queue"/> record with empty <ref table="Queue" column="dscp"/>
+        and <ref table="Queue" column="other_config"/> columns had been
+        specified.
         (Before version 1.6, Open vSwitch would leave queue 0 unconfigured in
         this case.  With some queuing disciplines, this dropped all packets
         destined for the default queue.)