Change in vdsm[master]: stomp: Drain pending bytes from ssl socket

danken at redhat.com danken at redhat.com
Fri Nov 20 16:32:48 UTC 2015


Dan Kenigsberg has submitted this change and it was merged.

Change subject: stomp: Drain pending bytes from ssl socket
......................................................................


stomp: Drain pending bytes from ssl socket

Since commit b2da4effe01f (asyncore: use default handing of read event),
we are not handling pending bytes in ssl socket internal buffer.

Stomp reactor was reading only 4096 bytes from the ssl socket buffer,
and polling again the socket file descriptor.  Until the next packet
arrived, we did not try to read the pending bytes from the ssl socket
buffer.

This broke migration when using jsonrpc. The destination host returned
a big response, and the source host got stuck after the reading the
first 4096 bytes, until the migration timed out.

Now all available bytes in are read and processed in handle_read.

Change-Id: I4ea37c35c871ae286863c5d4403bcf71ac803da5
Bug-Url: https://bugzilla.redhat.com/1274670
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
Tested-By: pkliczewski <piotr.kliczewski at gmail.com>
Tested-By: Milan Zamazal <mzamazal at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/48803
Continuous-Integration: Jenkins CI
Reviewed-by: Piotr Kliczewski <piotr.kliczewski at gmail.com>
Reviewed-by: Francesco Romani <fromani at redhat.com>
---
M lib/yajsonrpc/stomp.py
M tests/stompTests.py
2 files changed, 22 insertions(+), 10 deletions(-)

Approvals:
  Piotr Kliczewski: Looks good to me, approved
  Nir Soffer: Verified
  Jenkins CI: Passed CI tests
  Francesco Romani: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ea37c35c871ae286863c5d4403bcf71ac803da5
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Milan Zamazal <mzamazal at redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski at gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>


More information about the vdsm-patches mailing list