Dan Kenigsberg has submitted this change and it was merged.

Change subject: protocoldetector: Make socket blocking after detection
......................................................................


protocoldetector: Make socket blocking after detection

Commit b25dbdcce4 (Have the protocol detector use the Reactor)
introduced a regression, passing non-blocking sockets to the xmlrpc
server and the tests.

Before this commit, a socket was set to non-blocking mode when entering
to the protocol detector, and was set to blocking mode when exiting the
protocol detector.

The xmlrpc server used to work by accident, because we use a timeout in
the request handler, which set timeout on a socket, switching it to
non-blocking mode. The jsonrpc server needs non-blocking socket, but it
makes the socket non-blocking when accepting a socket.

This patch restores the previous behavior, setting the socket to
blocking mode when protocol detector pass the socket to the detector.

Change-Id: I25b1bc6aa8e06cbda63b2ba2a113e7db7b245f2b
Signed-off-by: Nir Soffer <nsof...@redhat.com>
Reviewed-on: https://gerrit.ovirt.org/39746
Reviewed-by: Piotr Kliczewski <piotr.kliczew...@gmail.com>
Reviewed-by: Dan Kenigsberg <dan...@redhat.com>
---
M tests/protocoldetectorTests.py
M vdsm/protocoldetector.py
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Piotr Kliczewski: Looks good to me, but someone else must approve
  Nir Soffer: Verified
  Dan Kenigsberg: Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/39746
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I25b1bc6aa8e06cbda63b2ba2a113e7db7b245f2b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsof...@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <dan...@redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuzn...@redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimo...@redhat.com>
Gerrit-Reviewer: Nir Soffer <nsof...@redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczew...@gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybron...@redhat.com>
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to