From: Andrew Evans <aevans@nicira.com>
Date: Fri, 28 Jan 2011 01:47:30 +0000 (-0800)
Subject: ovsdb-server: Correct Manager inactivity probe column name.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f441c1a854f243acf4a5abac4c3c612fe6937950;p=openvswitch

ovsdb-server: Correct Manager inactivity probe column name.

ovsdb-server tries to read from a column named 'probe_interval' in the Manager
table, but the column is actually named 'inactivity_probe', so a
user-configured probe interval will never be used.
---

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 9f63f3a8..b4f2e42e 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -346,7 +346,7 @@ add_manager_options(struct shash *remotes, const struct ovsdb_row *row)
     if (read_integer_column(row, "max_backoff", &max_backoff)) {
         options->max_backoff = max_backoff;
     }
-    if (read_integer_column(row, "probe_interval", &probe_interval)) {
+    if (read_integer_column(row, "inactivity_probe", &probe_interval)) {
         options->probe_interval = probe_interval;
     }
 }