Comment 28 for bug 1567668

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to neutron (stable/mitaka)

Reviewed: https://review.openstack.org/349415
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=f49a25c088392068e8a82f43cbab21d4a8981b10
Submitter: Jenkins
Branch: stable/mitaka

commit f49a25c088392068e8a82f43cbab21d4a8981b10
Author: Jakub Libosvar <email address hidden>
Date: Mon May 16 18:07:32 2016 +0000

    ovsdb: Don't let block() wait indefinitely

    Poller.block() calls select() on defined file descriptors. This patch
    adds timeout to select() so it doesn't get stuck in case no fd is ready.

    Also timeout was added when reading transaction results from queue.

    Conflicts:
     neutron/tests/functional/agent/test_l2_ovs_agent.py

    Closes-Bug: 1567668
    Change-Id: I7dbddd01409430ce93d8c23f04f02c46fb2a68c4
    (cherry picked from commit c13d722f3913137945c27fcc74371d3316129f30)