datapath: Backport more Netlink functions.

[openvswitch] / ovsdb / ovsdb-server.c

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 872cc9f9f4bfae30593f66e786d7a9c67e9eafc5..b4f2e42e2b032834260c286dc99c97b1b38aa108 100644 (file)
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -39,6 +39,7 @@
 #include "row.h"
 #include "stream-ssl.h"
 #include "stream.h"
+#include "stress.h"
 #include "svec.h"
 #include "table.h"
 #include "timeval.h"
@@ -87,6 +88,7 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
+    stress_init_command();
     signal(SIGPIPE, SIG_IGN);
     process_init();
 
@@ -149,6 +151,9 @@ main(int argc, char *argv[])
         if (run_process) {
             process_wait(run_process);
         }
+        if (exiting) {
+            poll_immediate_wake();
+        }
         poll_block();
     }
     ovsdb_jsonrpc_server_destroy(jsonrpc);
@@ -341,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;
     }
 }