Ensure SessionReceiverManager is cleaned up when closing #23121
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
the
JoshLove-msft
commented
Aug 5, 2021
| @@ -348,15 +355,15 @@ private async Task RenewSessionLock() | |||
| TaskContinuationOptions.ExecuteSynchronously, | |||
| TaskScheduler.Default) | |||
| .ConfigureAwait(false); | |||
| if (Receiver.IsClosed || delayTask.IsCanceled) | |||
There was a problem hiding this comment.
This should not be necessary as we await the RenewSessionLock task before calling Dispose on the receiver.
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jsquire
approved these changes
Aug 5, 2021
sdk/servicebus/Azure.Messaging.ServiceBus/src/Processor/SessionReceiverManager.cs
Show resolved
Hide resolved
| @@ -287,7 +295,7 @@ public override async Task ReceiveAndProcessMessagesAsync(CancellationToken proc | |||
| } | |||
| } | |||
| catch (Exception ex) | |||
| when (!(ex is TaskCanceledException) || | |||
| when (ex is not TaskCanceledException || | |||
There was a problem hiding this comment.
I found this flow difficult to read. It took me a few passes to pick up on 299-301 still being part of the where.
| { | ||
| break; | ||
| } | ||
| await _receiver.RenewSessionLockAsync(sessionLockRenewalCancellationToken).ConfigureAwait(false); | ||
| ServiceBusEventSource.Log.ProcessorRenewSessionLockComplete(Processor.Identifier); | ||
| } | ||
|
|
||
| catch (Exception ex) when (!(ex is TaskCanceledException)) | ||
| catch (Exception ex) when (ex is not TaskCanceledException) |
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
pakrym
reviewed
Aug 5, 2021
| @@ -980,6 +981,7 @@ private void WakeLoop() | |||
| // wake up the handler loop | |||
| var handlerCts = Interlocked.Exchange(ref _handlerCts, new CancellationTokenSource()); | |||
| handlerCts.Cancel(); | |||
| handlerCts.Dispose(); | |||
There was a problem hiding this comment.
I'm 78% certain you don't need to dispose after cancel.
There was a problem hiding this comment.
It made Rider happy
There was a problem hiding this comment.
pakrym
approved these changes
Aug 5, 2021
|
/azp run net - servicebus - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
azure-sdk
pushed a commit
to azure-sdk/azure-sdk-for-net
that referenced
this pull request
Apr 14, 2023
Release sentinel 2023 04 01 preview (Azure#23121) * Adds base for updating Microsoft.SecurityInsights from version preview/2023-03-01-preview to version 2023-04-01-preview * Updates readme * Updates API version in new specs and examples * Workspace Manager Members (Azure#23134) * Adds base for updating Microsoft.SecurityInsights from version preview/2023-02-01-preview to version 2023-04-01-preview * Updates readme * Updates API version in new specs and examples * Workspace Manager Members * udpate pattern * Workspace manager configurations (Azure#23133) * Adds base for updating Microsoft.SecurityInsights from version preview/2023-02-01-preview to version 2023-04-01-preview * Updates readme * Updates API version in new specs and examples * adding april configurations swagger * update pattern * prettier update * update readme * Workspace manager assignments (Azure#23130) * Adds base for updating Microsoft.SecurityInsights from version preview/2023-02-01-preview to version 2023-04-01-preview * Updates readme * Updates API version in new specs and examples * Workspace Manager Assignments/Jobs * update readme * updated from comments * update from lint diff errors * updated descriptions * Workspace manager groups (Azure#23135) * Adds base for updating Microsoft.SecurityInsights from version preview/2023-02-01-preview to version 2023-04-01-preview * Updates readme * Updates API version in new specs and examples * april swagger for groups * update path name & pattern * [Hunts] Add hunts to Sentinel 2023-04-01-preview version (Azure#23139) * Add hunts files * Include update in 200 description and add defaults * Add back 201 * Update relation properties * Update example --------- Co-authored-by: Derrick Lee <derricklee@microsoft.com> * Add readonly flag to providerName property (Azure#23259) * sentinel content hub package and template API (Azure#23151) * commit for content template and content package API * fix issues reported by swagger lint * add 201 for put requests in template service * resolve the comments * resolve comments in packageId * resolve comments * update descriptions due to lint error (Azure#23392) * Fix policheck issue by updating the description. (Azure#23415) * Fix polich issue by updating the description. * update the description to fix a typo. * Release sentinel 2023 04 01 preview (Azure#23420) * Fix polich issue by updating the description. * update the description to fix a typo. * fix policheck by updating description * rename enum name to stable version to fix cross-version breaking change failure. * fix typo (Azure#23463) --------- Co-authored-by: rheabansal <93624991+rheabansal@users.noreply.github.com> Co-authored-by: Derrick Lee <derricklee91@gmail.com> Co-authored-by: Derrick Lee <derricklee@microsoft.com> Co-authored-by: Anat Gilenson <53407600+anat-gilenson@users.noreply.github.com> Co-authored-by: xuhumsft <116764429+xuhumsft@users.noreply.github.com> Co-authored-by: Nan Zang <nazang@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While investigating #23065, I noticed that there is a case where _receiver may not be reset to null even after we attempt to Dispose it, this could lead to a new session never getting accepted. I don't think it would lead to the behavior from the issue, as we should still be exiting the receive loop once we have a sessionLockLost error.