openstack
/
neutron
Code Issues Proposed changes

Merge "Remove sleep command when retrieving OVS dp" into stable/rocky

This commit is contained in:
Zuul 2020-02-25 18:57:37 +00:00 committed by Gerrit Code Review
parent 051847f55a 54b0062963
commit e07186a0ec
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py
View File

@ -70,14 +70,13 @@ class OpenFlowSwitchMixin(object):
dp = ofctl_api.get_datapath(self._app, dpid_int) dp = ofctl_api.get_datapath(self._app, dpid_int)
if dp is not None: if dp is not None:
break break
# The switch has not established a connection to us. # The switch has not established a connection to us; retry again
# Wait for a little. # until timeout.
if timeutils.now() > start_time + timeout_sec: if timeutils.now() > start_time + timeout_sec:
m = _("Switch connection timeout") m = _("Switch connection timeout")
LOG.error(m) LOG.error(m)
# NOTE(yamamoto): use RuntimeError for compat with ovs_lib # NOTE(yamamoto): use RuntimeError for compat with ovs_lib
raise RuntimeError(m) raise RuntimeError(m)
eventlet.sleep(1)
return dp return dp
def _send_msg(self, msg, reply_cls=None, reply_multi=False, def _send_msg(self, msg, reply_cls=None, reply_multi=False,