diff mbox

[ovs-dev,1/1] ovsdb: Fix ovsdb-server replication blocking bug

Message ID CS1PR84MB0040F4034521A060EAD96471FA220@CS1PR84MB0040.NAMPRD84.PROD.OUTLOOK.COM
State Accepted
Headers show

Commit Message

Cabrera Vega, Mario Alberto June 28, 2016, 9:50 p.m. UTC
With this patch ovsdb-server no longer blocks waiting for the remote server
connection when doing replication.

Signed-off-by: Mario Cabrera <mario.cabrera@hpe.com>
---
ovsdb/replication.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Comments

Ben Pfaff June 28, 2016, 10:09 p.m. UTC | #1
On Tue, Jun 28, 2016 at 09:50:34PM +0000, Cabrera Vega, Mario Alberto wrote:
> With this patch ovsdb-server no longer blocks waiting for the remote server
> connection when doing replication.
> 
> Signed-off-by: Mario Cabrera <mario.cabrera@hpe.com>

Thanks.  This fixes part of a problem, so I applied it, but the problem
is sure to recur due to the other blocking calls in replication.c:

    245:    error = check_jsonrpc_error(jsonrpc_transact_block(rpc, request, &reply),
    284:    error = check_jsonrpc_error(jsonrpc_transact_block(rpc, request, &reply),
    362:    jsonrpc_recv_block(rpc, &msg);

Thanks,

Ben.
diff mbox

Patch

diff --git a/ovsdb/replication.c b/ovsdb/replication.c
index c5b2368..8226cb9 100644
--- a/ovsdb/replication.c
+++ b/ovsdb/replication.c
@@ -216,8 +216,7 @@  open_jsonrpc(const char *server)
     struct stream *stream;
     int error;
-    error = stream_open_block(jsonrpc_stream_open(server, &stream,
-                                                  DSCP_DEFAULT), &stream);
+    error = jsonrpc_stream_open(server, &stream, DSCP_DEFAULT);
     return error ? NULL : jsonrpc_open(stream);
}
--
1.9.1
_______________________________________________