-
Notifications
You must be signed in to change notification settings - Fork 59
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.
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
Fixing a rare case of AuthorizationFailedException #373
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -102,11 +102,13 @@ public class CoreMessageReceiver extends ClientEntity implements IAmqpReceiver, | |
private ScheduledFuture<?> sasTokenRenewTimerFuture; | ||
private CompletableFuture<Void> requestResponseLinkCreationFuture; | ||
private CompletableFuture<Void> receiveLinkReopenFuture; | ||
private CompletableFuture<Void> ensureLinkReopenFutureToWaitOn; | ||
private final Runnable timedOutUpdateStateRequestsDaemon; | ||
private final Runnable returnMesagesLoopDaemon; | ||
private final ScheduledFuture<?> updateStateRequestsTimeoutChecker; | ||
private final ScheduledFuture<?> returnMessagesLoopRunner; | ||
private final MessagingEntityType entityType; | ||
private boolean shouldRetryLinkReopenOnTransientFailure = true; | ||
|
||
// TODO Change onReceiveComplete to handle empty deliveries. Change onError to retry updateState requests. | ||
private CoreMessageReceiver(final MessagingFactory factory, | ||
|
@@ -370,8 +372,25 @@ private void closeRequestResponseLink() | |
private void createReceiveLink() | ||
{ | ||
TRACE_LOGGER.info("Creating receive link to '{}'", this.receivePath); | ||
Connection connection = this.underlyingFactory.getConnection(); | ||
|
||
Connection connection = this.underlyingFactory.getActiveConnectionOrNothing(); | ||
if (connection == null) { | ||
// Connection closed after sending CBS token. Happens only in the rare case of azure service bus closing idle connection, just right after sending | ||
// CBS token but before opening a link. | ||
TRACE_LOGGER.warn("Idle connection closed by service just after sending CBS token. Very rare case. Will retry."); | ||
ServiceBusException exception = new ServiceBusException(true, "Idle connection closed by service just after sending CBS token. Please retry."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Should this be SBCommunicationException? |
||
if (this.linkOpen != null && !this.linkOpen.getWork().isDone()) { | ||
// Should never happen | ||
AsyncUtil.completeFutureExceptionally(this.linkOpen.getWork(), exception); | ||
} | ||
|
||
if(this.receiveLinkReopenFuture != null && !this.receiveLinkReopenFuture.isDone()) { | ||
// Complete the future and re-attempt link creation | ||
AsyncUtil.completeFutureExceptionally(this.receiveLinkReopenFuture, exception); | ||
} | ||
|
||
return; | ||
} | ||
|
||
final Session session = connection.session(); | ||
session.setIncomingCapacity(Integer.MAX_VALUE); | ||
session.open(); | ||
|
@@ -877,7 +896,7 @@ public void onEvent() | |
catch (IOException ioException) | ||
{ | ||
this.pendingReceives.remove(receiveWorkItem); | ||
this.reduceCreditForCompletedReceiveRequest(receiveWorkItem.getMaxMessageCount()); | ||
this.reduceCreditForCompletedReceiveRequest(receiveWorkItem.getMaxMessageCount()); | ||
receiveWorkItem.getWork().completeExceptionally(generateDispatacherSchedulingFailedException("completeMessage", ioException)); | ||
receiveWorkItem.cancelTimeoutTask(false); | ||
} | ||
|
@@ -1191,7 +1210,33 @@ public void onEvent() | |
}, MessagingFactory.INTERNAL_THREAD_POOL); | ||
} | ||
|
||
return this.receiveLinkReopenFuture; | ||
if (this.ensureLinkReopenFutureToWaitOn == null || this.ensureLinkReopenFutureToWaitOn.isDone()) { | ||
this.ensureLinkReopenFutureToWaitOn = new CompletableFuture<Void>(); | ||
this.shouldRetryLinkReopenOnTransientFailure = true; | ||
} | ||
|
||
this.receiveLinkReopenFuture.handleAsync((v, ex) -> { | ||
if (ex == null) { | ||
this.ensureLinkReopenFutureToWaitOn.complete(null); | ||
} else { | ||
if (ex instanceof ServiceBusException && ((ServiceBusException)ex).getIsTransient()) { | ||
if (this.shouldRetryLinkReopenOnTransientFailure) { | ||
// Retry link creation | ||
this.shouldRetryLinkReopenOnTransientFailure = false; | ||
this.ensureLinkIsOpen(); | ||
} else { | ||
this.ensureLinkReopenFutureToWaitOn.completeExceptionally(ex); | ||
} | ||
} else { | ||
this.ensureLinkReopenFutureToWaitOn.completeExceptionally(ex); | ||
} | ||
|
||
} | ||
return null; | ||
}, | ||
MessagingFactory.INTERNAL_THREAD_POOL); | ||
|
||
return this.ensureLinkReopenFutureToWaitOn; | ||
} | ||
else | ||
{ | ||
|
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wonder if this is too much of details mentioning about CBS.