summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/jsonrpc.c4
-rw-r--r--lib/stream-fd.c2
-rw-r--r--lib/stream-provider.h10
-rw-r--r--lib/stream-ssl.c2
-rw-r--r--lib/stream-tcp.c2
-rw-r--r--lib/stream-unix.c2
-rw-r--r--lib/stream.c19
-rw-r--r--lib/stream.h1
-rw-r--r--ovsdb/jsonrpc-server.c6
-rw-r--r--ovsdb/jsonrpc-server.h3
-rw-r--r--ovsdb/ovsdb-server.c2
-rw-r--r--python/ovs/jsonrpc.py3
-rw-r--r--python/ovs/stream.py13
13 files changed, 65 insertions, 4 deletions
diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
index fa3362d17..e95db8afc 100644
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.c
@@ -764,6 +764,10 @@ jsonrpc_session_open(const char *name)
reconnect_set_passive(s->reconnect, true, time_msec());
}
+ if (!stream_or_pstream_needs_probes(name)) {
+ reconnect_set_probe_interval(s->reconnect, 0);
+ }
+
return s;
}
diff --git a/lib/stream-fd.c b/lib/stream-fd.c
index 38dba7c71..4113e3fc1 100644
--- a/lib/stream-fd.c
+++ b/lib/stream-fd.c
@@ -150,6 +150,7 @@ fd_wait(struct stream *stream, enum stream_wait_type wait)
static const struct stream_class stream_fd_class = {
"fd", /* name */
+ false, /* needs_probes */
NULL, /* open */
fd_close, /* close */
fd_connect, /* connect */
@@ -255,6 +256,7 @@ pfd_wait(struct pstream *pstream)
static struct pstream_class fd_pstream_class = {
"pstream",
+ false,
NULL,
pfd_close,
pfd_accept,
diff --git a/lib/stream-provider.h b/lib/stream-provider.h
index 77d0a1060..3decb5a8a 100644
--- a/lib/stream-provider.h
+++ b/lib/stream-provider.h
@@ -54,6 +54,11 @@ struct stream_class {
/* Prefix for connection names, e.g. "tcp", "ssl", "unix". */
const char *name;
+ /* True if this stream needs periodic probes to verify connectivty. For
+ * streams which need probes, it can take a long time to notice the
+ * connection was dropped. */
+ bool needs_probes;
+
/* Attempts to connect to a peer. 'name' is the full connection name
* provided by the user, e.g. "tcp:1.2.3.4". This name is useful for error
* messages but must not be modified.
@@ -151,6 +156,11 @@ struct pstream_class {
/* Prefix for connection names, e.g. "ptcp", "pssl", "punix". */
const char *name;
+ /* True if this pstream needs periodic probes to verify connectivty. For
+ * pstreams which need probes, it can take a long time to notice the
+ * connection was dropped. */
+ bool needs_probes;
+
/* Attempts to start listening for stream connections. 'name' is the full
* connection name provided by the user, e.g. "ptcp:1234". This name is
* useful for error messages but must not be modified.
diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index 5463388ea..ad572d352 100644
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.c
@@ -755,6 +755,7 @@ ssl_wait(struct stream *stream, enum stream_wait_type wait)
const struct stream_class ssl_stream_class = {
"ssl", /* name */
+ true, /* needs_probes */
ssl_open, /* open */
ssl_close, /* close */
ssl_connect, /* connect */
@@ -861,6 +862,7 @@ pssl_wait(struct pstream *pstream)
const struct pstream_class pssl_pstream_class = {
"pssl",
+ true,
pssl_open,
pssl_close,
pssl_accept,
diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c
index c7a2ee2e8..9762f88ed 100644
--- a/lib/stream-tcp.c
+++ b/lib/stream-tcp.c
@@ -86,6 +86,7 @@ tcp_open(const char *name, char *suffix, struct stream **streamp, uint8_t dscp)
const struct stream_class tcp_stream_class = {
"tcp", /* name */
+ true, /* needs_probes */
tcp_open, /* open */
NULL, /* close */
NULL, /* connect */
@@ -137,6 +138,7 @@ ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
const struct pstream_class ptcp_pstream_class = {
"ptcp",
+ true,
ptcp_open,
NULL,
NULL,
diff --git a/lib/stream-unix.c b/lib/stream-unix.c
index a9d76f257..40ef01248 100644
--- a/lib/stream-unix.c
+++ b/lib/stream-unix.c
@@ -57,6 +57,7 @@ unix_open(const char *name, char *suffix, struct stream **streamp,
const struct stream_class unix_stream_class = {
"unix", /* name */
+ false, /* needs_probes */
unix_open, /* open */
NULL, /* close */
NULL, /* connect */
@@ -113,6 +114,7 @@ punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
const struct pstream_class punix_pstream_class = {
"punix",
+ false,
punix_open,
NULL,
NULL,
diff --git a/lib/stream.c b/lib/stream.c
index 2f418c42a..eabace8a4 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -489,6 +489,25 @@ pstream_verify_name(const char *name)
return pstream_lookup_class(name, &class);
}
+/* Returns 1 if the stream or pstream specified by 'name' needs periodic probes
+ * to verify connectivity. For [p]streams which need probes, it can take a
+ * long time to notice the connection has been dropped. Returns 0 if the
+ * stream or pstream does not need probes, and -1 if 'name' is not valid. */
+int
+stream_or_pstream_needs_probes(const char *name)
+{
+ const struct pstream_class *pclass;
+ const struct stream_class *class;
+
+ if (!stream_lookup_class(name, &class)) {
+ return class->needs_probes;
+ } else if (!pstream_lookup_class(name, &pclass)) {
+ return pclass->needs_probes;
+ } else {
+ return -1;
+ }
+}
+
/* Attempts to start listening for remote stream connections. 'name' is a
* connection name in the form "TYPE:ARGS", where TYPE is an passive stream
* class's name and ARGS are stream class-specific.
diff --git a/lib/stream.h b/lib/stream.h
index c1f3adb6b..bd3901747 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -82,6 +82,7 @@ bool stream_parse_target_with_default_ports(const char *target,
uint16_t default_tcp_port,
uint16_t default_ssl_port,
struct sockaddr_in *sin);
+int stream_or_pstream_needs_probes(const char *name);
/* Error reporting. */
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 1848bb989..88656b965 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 c5ea6faf2..344ed9da2 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 776bbb258..699401813 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);
}
diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index 5f90b3962..b72af77cf 100644
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -372,6 +372,9 @@ class Session(object):
if ovs.stream.PassiveStream.is_valid_name(name):
reconnect.set_passive(True, ovs.timeval.msec())
+ if ovs.stream.stream_or_pstream_needs_probes(name):
+ reconnect.set_probe_interval(0)
+
return Session(reconnect, None)
@staticmethod
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 08c6293ad..e2adaa5b0 100644
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -24,6 +24,19 @@ import ovs.vlog
vlog = ovs.vlog.Vlog("stream")
+def stream_or_pstream_needs_probes(name):
+ """ 1 if the stream or pstream specified by 'name' needs periodic probes to
+ verify connectivty. For [p]streams which need probes, it can take a long
+ time to notice the connection was dropped. Returns 0 if probes aren't
+ needed, and -1 if 'name' is invalid"""
+
+ if PassiveStream.is_valid_name(name) or Stream.is_valid_name(name):
+ # Only unix and punix are supported currently.
+ return 0
+ else:
+ return -1
+
+
class Stream(object):
"""Bidirectional byte stream. Currently only Unix domain sockets
are implemented."""
View Lorry Controller Status