Skip to content

[SB] Link-Detach #34820

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

Merged
swathipil merged 6 commits into from
Mar 20, 2024
Merged

[SB] Link-Detach #34820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43eb679
if it isnt a user started detach
l0lawrence Mar 18, 2024
c2077fb
set error instead of raise + comments
kashifkhan Mar 19, 2024
4bc06dd
fix mypy issue for self._error
kashifkhan Mar 19, 2024
0d61e79
fix pylint
kashifkhan Mar 19, 2024
3f7534b
change error condition
kashifkhan Mar 19, 2024
9acebda
fix comment
kashifkhan Mar 20, 2024
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
7 changes: 6 additions & 1 deletion sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_link_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def __init__(
self._is_closed = False
self._on_link_state_change = kwargs.get("on_link_state_change")
self._on_attach = kwargs.get("on_attach")
self._error = None
self._error: Optional[AMQPLinkError] = None

async def __aenter__(self) -> "Link":
await self.attach()
Expand Down Expand Up @@ -244,6 +244,11 @@ async def _incoming_detach(self, frame) -> None:
self._error = error_cls(condition=frame[2][0], description=frame[2][1], info=frame[2][2])
await self._set_state(LinkState.ERROR)
else:
if self.state != LinkState.DETACH_SENT:
# Handle the case of when the remote side detaches without sending an error.
# We should detach as per the spec but then retry connecting
self._error = AMQPLinkError(condition=ErrorCondition.UnknownError,
description="Link detached unexpectedly.", retryable=True)
await self._set_state(LinkState.DETACHED)

async def attach(self) -> None:
Expand Down
7 changes: 6 additions & 1 deletion sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def __init__(
self._is_closed = False
self._on_link_state_change = kwargs.get("on_link_state_change")
self._on_attach = kwargs.get("on_attach")
self._error = None
self._error: Optional[AMQPLinkError] = None

def __enter__(self) -> "Link":
self.attach()
Expand Down Expand Up @@ -239,6 +239,11 @@ def _incoming_detach(self, frame) -> None:
self._error = error_cls(condition=frame[2][0], description=frame[2][1], info=frame[2][2])
self._set_state(LinkState.ERROR)
else:
if self.state != LinkState.DETACH_SENT:
# Handle the case of when the remote side detaches without sending an error.
# We should detach as per the spec but then retry connecting
self._error = AMQPLinkError(condition=ErrorCondition.UnknownError,
description="Link detached unexpectedly.", retryable=True)
self._set_state(LinkState.DETACHED)

def attach(self) -> None:
Expand Down