瀏覽代碼

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

tags/14.1.0
Zuul Gerrit Code Review 4 月之前
父節點
當前提交
06cf8966b9
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. +2
    -3
      neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py

+ 2
- 3
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py 查看文件

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

def _send_msg(self, msg, reply_cls=None, reply_multi=False,


Loading…
取消
儲存