mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-21 14:49:41 +00:00
Code Issues Releases Wiki Activity

jsonrpc: Treat draining data from send queue as activity.

Browse Source 
Until now, the jsonrpc module has used messages received from the
remote peer as the sole means to determine that the JSON-RPC
connection is up.  This could in theory interact badly with a
remote peer that stops reading and processing messages from the
receive queue when there is a backlog in the send queue for a
given connection (ovsdb-server is an example of a program that
behaves this way).  This commit fixes the problem by expanding
the definition of "activity" to include successfully sending
JSON-RPC data that was previously queued.

The above change is exactly analogous to the similar change
made to the rconn library in commit 133f2dc954 (rconn: Treat
draining a message from the send queue as activity.).

Bug #12789.
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-09-07 10:50:15 -07:00
parent a6f639f808
commit f97cae2999
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jsonrpc.c
View File

@@ -880,9 +880,23 @@ jsonrpc_session_run(struct jsonrpc_session *s)
} }
if (s->rpc) { if (s->rpc) {
size_t backlog;
int error; int error;
backlog = jsonrpc_get_backlog(s->rpc);
jsonrpc_run(s->rpc); jsonrpc_run(s->rpc);
if (jsonrpc_get_backlog(s->rpc) < backlog) {
/* Data previously caught in a queue was successfully sent (or
* there's an error, which we'll catch below.)
*
* We don't count data that is successfully sent immediately as
* activity, because there's a lot of queuing downstream from us,
* which means that we can push a lot of data into a connection
* that has stalled and won't ever recover.
*/
reconnect_activity(s->reconnect, time_msec());
}
error = jsonrpc_get_status(s->rpc); error = jsonrpc_get_status(s->rpc);
if (error) { if (error) {
reconnect_disconnected(s->reconnect, time_msec(), error); reconnect_disconnected(s->reconnect, time_msec(), error);

12
python/ovs/jsonrpc.py
View File

@@ -502,9 +502,19 @@ class Session(object):
def recv(self): def recv(self):
if self.rpc is not None: if self.rpc is not None:
backlog = self.rpc.get_backlog()
error, msg = self.rpc.recv() error, msg = self.rpc.recv()
if not error: if self.rpc.get_backlog() < backlog:
# Data previously caught in a queue was successfully sent (or
# there's an error, which we'll catch below).
#
# We don't count data that is successfully sent immediately as
# activity, because there's a lot of queuing downstream from
# us, which means that we can push a lot of data into a
# connection that has stalled and won't ever recover.
self.reconnect.activity(ovs.timeval.msec()) self.reconnect.activity(ovs.timeval.msec())
if not error:
if msg.type == Message.T_REQUEST and msg.method == "echo": if msg.type == Message.T_REQUEST and msg.method == "echo":
# Echo request. Send reply. # Echo request. Send reply.
self.send(Message.create_reply(msg.params, msg.id)) self.send(Message.create_reply(msg.params, msg.id))