Skip to content

[azservicebus,azeventhubs] Fixing issue where $cbs link being incompletely closed prevented the connection from recovering #20334

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
richardpark-msft merged 4 commits into from
Mar 7, 2023
Merged

[azservicebus,azeventhubs] Fixing issue where $cbs link being incompletely closed prevented the connection from recovering #20334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cbf62e
Fixing an issue where a incompete close on the $cbs endpoint would re…
Mar 4, 2023
5638ae2
Updating with PR#
Mar 4, 2023
40b87ec
prepare-release
Mar 4, 2023
b0a17b4
Add in logging message
Mar 4, 2023
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
Prev Previous commit
Add in logging message
  • Loading branch information
Richard Park committed Mar 4, 2023
commit b0a17b4a2c2194b56d5fe557a735e93a82760ef0
2 changes: 2 additions & 0 deletions sdk/messaging/azeventhubs/internal/cbs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"errors"

"github.com/Azure/azure-sdk-for-go/sdk/internal/log"
azlog "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/amqpwrap"
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/auth"
Expand Down Expand Up @@ -39,6 +40,7 @@ func NegotiateClaim(ctx context.Context, audience string, conn amqpwrap.AMQPClie
// or interrupted, leaving $cbs still open by some dangling receiver or sender. The only way
// to fix this is to restart the connection.
if IsNotAllowedError(err) {
log.Writef(exported.EventAuth, "Not allowed to open, connection will be reset: %s", err)
return errConnResetNeeded
}

Expand Down
2 changes: 2 additions & 0 deletions sdk/messaging/azservicebus/internal/cbs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package internal
import (
"context"

"github.com/Azure/azure-sdk-for-go/sdk/internal/log"
azlog "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/amqpwrap"
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/auth"
Expand Down Expand Up @@ -35,6 +36,7 @@ func NegotiateClaim(ctx context.Context, audience string, conn amqpwrap.AMQPClie
// or interrupted, leaving $cbs still open by some dangling receiver or sender. The only way
// to fix this is to restart the connection.
if IsNotAllowedError(err) {
log.Writef(exported.EventAuth, "Not allowed to open, connection will be reset: %s", err)
return errConnResetNeeded
}

Expand Down