diff options
author | Ethan Jackson <ethan@nicira.com> | 2012-04-11 20:18:34 -0700 |
---|---|---|
committer | Ethan Jackson <ethan@nicira.com> | 2012-04-12 00:43:22 -0700 |
commit | f1936eb65178f796d26a8d265697af8c19dce8cd (patch) | |
tree | 05616ee0958f35adcb6822354a74905a89f659b1 /ovsdb | |
parent | bceb55c8ba91af812bc61e1ebc54f367ad034157 (diff) |
stream: By default disable probing on unix sockets.
There isn't a lot of value in sending inactivity probes on unix
sockets. This patch changes the default to disable them.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'ovsdb')
-rw-r--r-- | ovsdb/jsonrpc-server.c | 6 | ||||
-rw-r--r-- | ovsdb/jsonrpc-server.h | 3 | ||||
-rw-r--r-- | ovsdb/ovsdb-server.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 1848bb98..88656b96 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -127,11 +127,13 @@ ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *svr) } struct ovsdb_jsonrpc_options * -ovsdb_jsonrpc_default_options(void) +ovsdb_jsonrpc_default_options(const char *target) { struct ovsdb_jsonrpc_options *options = xzalloc(sizeof *options); - options->probe_interval = RECONNECT_DEFAULT_PROBE_INTERVAL; options->max_backoff = RECONNECT_DEFAULT_MAX_BACKOFF; + options->probe_interval = (stream_or_pstream_needs_probes(target) + ? RECONNECT_DEFAULT_PROBE_INTERVAL + : 0); return options; } diff --git a/ovsdb/jsonrpc-server.h b/ovsdb/jsonrpc-server.h index c5ea6faf..344ed9da 100644 --- a/ovsdb/jsonrpc-server.h +++ b/ovsdb/jsonrpc-server.h @@ -30,7 +30,8 @@ struct ovsdb_jsonrpc_options { int probe_interval; /* Max idle time before probing, in msec. */ int dscp; /* Dscp value for manager connections */ }; -struct ovsdb_jsonrpc_options *ovsdb_jsonrpc_default_options(void); +struct ovsdb_jsonrpc_options * +ovsdb_jsonrpc_default_options(const char *target); void ovsdb_jsonrpc_server_set_remotes(struct ovsdb_jsonrpc_server *, const struct shash *); diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 776bbb25..69940181 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -276,7 +276,7 @@ add_remote(struct shash *remotes, const char *target) options = shash_find_data(remotes, target); if (!options) { - options = ovsdb_jsonrpc_default_options(); + options = ovsdb_jsonrpc_default_options(target); shash_add(remotes, target, options); } |