Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Pyamqp] Pyamqp fix conn #26568

Merged
merged 3 commits into from
Oct 1, 2022
Merged

[Pyamqp] Pyamqp fix conn #26568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d01118
remove unnecessary pops
kashifkhan Sep 30, 2022
0eb4d33
fix var name + remove unnecessary pop
kashifkhan Sep 30, 2022
ff02283
fix
kashifkhan Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_pyamqp/_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,6 @@ def _incoming_end(self, channel, frame):
description="Invalid channel number received"
))
return
self._incoming_endpoints.pop(channel)
self._outgoing_endpoints.pop(channel)

def _process_incoming_frame(self, channel, frame): # pylint:disable=too-many-return-statements
# type: (int, Optional[Union[bytes, Tuple[int, Tuple[Any, ...]]]]) -> bool
Expand Down
45 changes: 23 additions & 22 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_pyamqp/_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,28 @@ def _connect(self, host, port, timeout):
try:
entries = socket.getaddrinfo(host, port, family, socket.SOCK_STREAM, SOL_TCP)
entries_num = len(entries)
# now that we have address(es) for the hostname, connect to broker
for i, res in enumerate(entries):
af, socktype, proto, _, sa = res
try:
self.sock = socket.socket(af, socktype, proto)
try:
set_cloexec(self.sock, True)
except NotImplementedError:
pass
self.sock.settimeout(timeout)
self.sock.connect(sa)
except socket.error as ex:
e = ex
if self.sock is not None:
self.sock.close()
self.sock = None
# we may have depleted all our options
if i + 1 >= entries_num and n + 1 >= addr_types_num:
raise
else:
# hurray, we established connection
return
except socket.gaierror:
# we may have depleted all our options
if n + 1 >= addr_types_num:
Expand All @@ -294,28 +316,7 @@ def _connect(self, host, port, timeout):
raise e if e is not None else socket.error("failed to resolve broker hostname")
continue # pragma: no cover

# now that we have address(es) for the hostname, connect to broker
for i, res in enumerate(entries):
af, socktype, proto, _, sa = res
try:
self.sock = socket.socket(af, socktype, proto)
try:
set_cloexec(self.sock, True)
except NotImplementedError:
pass
self.sock.settimeout(timeout)
self.sock.connect(sa)
except socket.error as ex:
e = ex
if self.sock is not None:
self.sock.close()
self.sock = None
# we may have depleted all our options
if i + 1 >= entries_num and n + 1 >= addr_types_num:
raise
else:
# hurray, we established connection
return


def _init_socket(self, socket_settings, read_timeout, write_timeout):
self.sock.settimeout(None) # set socket back to blocking mode
Expand Down
6 changes: 2 additions & 4 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_pyamqp/aio/_connection_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,8 @@ async def _incoming_end(self, channel, frame):
"""
try:
await self._incoming_endpoints[channel]._incoming_end(frame) # pylint:disable=protected-access
self.incoming_endpoints.pop(channel)
self.outgoing_endpoints.pop(channel)
self._incoming_endpoints.pop(channel)
self._outgoing_endpoints.pop(channel)
except KeyError:
#close the connection
await self.close(
Expand All @@ -480,8 +480,6 @@ async def _incoming_end(self, channel, frame):
description="Invalid channel number received"
))
return
self._incoming_endpoints.pop(channel)
self._outgoing_endpoints.pop(channel)

async def _process_incoming_frame(self, channel, frame): # pylint:disable=too-many-return-statements
# type: (int, Optional[Union[bytes, Tuple[int, Tuple[Any, ...]]]]) -> bool
Expand Down
45 changes: 23 additions & 22 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_pyamqp/aio/_transport_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,28 @@ async def _connect(self, host, port, timeout):
try:
entries = await self.loop.getaddrinfo(host, port, family=family, type=socket.SOCK_STREAM, proto=SOL_TCP)
entries_num = len(entries)
# now that we have address(es) for the hostname, connect to broker
for i, res in enumerate(entries):
af, socktype, proto, _, sa = res
try:
self.sock = socket.socket(af, socktype, proto)
try:
set_cloexec(self.sock, True)
except NotImplementedError:
pass
self.sock.settimeout(timeout)
await self.loop.sock_connect(self.sock, sa)
except socket.error as ex:
e = ex
if self.sock is not None:
self.sock.close()
self.sock = None
# we may have depleted all our options
if i + 1 >= entries_num and n + 1 >= addr_types_num:
raise
else:
# hurray, we established connection
return
except socket.gaierror:
# we may have depleted all our options
if n + 1 >= addr_types_num:
Expand All @@ -266,28 +288,7 @@ async def _connect(self, host, port, timeout):
raise e if e is not None else socket.error("failed to resolve broker hostname")
continue # pragma: no cover

# now that we have address(es) for the hostname, connect to broker
for i, res in enumerate(entries):
af, socktype, proto, _, sa = res
try:
self.sock = socket.socket(af, socktype, proto)
try:
set_cloexec(self.sock, True)
except NotImplementedError:
pass
self.sock.settimeout(timeout)
await self.loop.sock_connect(self.sock, sa)
except socket.error as ex:
e = ex
if self.sock is not None:
self.sock.close()
self.sock = None
# we may have depleted all our options
if i + 1 >= entries_num and n + 1 >= addr_types_num:
raise
else:
# hurray, we established connection
return


def _init_socket(self, socket_settings, read_timeout, write_timeout):
self.sock.settimeout(None) # set socket back to blocking mode
Expand Down