diff options
author | Ben Pfaff <blp@nicira.com> | 2010-11-16 15:14:58 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-11-16 15:14:58 -0800 |
commit | 6d37aaf186c9f4595258903241f4fa0175ecf6dd (patch) | |
tree | 9f54c3cea247bc064501d5785d39bb48da420aa3 /ovsdb | |
parent | 024f4f7d869c2785a8dff904cf19b61e4993386b (diff) |
Make the "exit" unixctl command reliable in ovsdb-server, ovs-vswitchd.
If "ovs-appctl exit" happens to hit ovsdb-server or ovs-vswitchd at a
moment when nothing else is happening to wake the daemon up, it can take a
long time for them to exit.
This seems to account for occasional "make check" failures on Nicira's
internal builds. It probably fixes some Debian automatic build failures
as well.
Diffstat (limited to 'ovsdb')
-rw-r--r-- | ovsdb/ovsdb-server.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 872cc9f9..c7a93815 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -149,6 +149,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); |