Skip to content

Event Hubs: Handle additional retriable/reconnectable recoverable AMQP connection cases #4213

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

Open
milas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Event Hubs: Handle additional retriable/reconnectable recoverable AMQP connection cases #4213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 61 additions & 2 deletions sdk/eventhubs/azure_messaging_eventhubs/src/common/recoverable/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,8 @@ impl RecoverableConnection {
}
}
AmqpErrorKind::ConnectionClosedByRemote(_)
| AmqpErrorKind::ConnectionDetachedByRemote(_) => {
| AmqpErrorKind::ConnectionDetachedByRemote(_)
| AmqpErrorKind::ConnectionDropped(_) => {
debug!("Connection dropped error: {}", amqp_error);
ErrorRecoveryAction::ReconnectConnection
}
Expand All @@ -597,14 +598,25 @@ impl RecoverableConnection {
if matches!(
described_error.condition,
AmqpErrorCondition::ResourceLimitExceeded
| AmqpErrorCondition::ConnectionFramingError
| AmqpErrorCondition::LinkStolen
| AmqpErrorCondition::ServerBusyError
| AmqpErrorCondition::EntityUpdated
| AmqpErrorCondition::EntityDisabledError
| AmqpErrorCondition::TimeoutError
) {
debug!("AMQP described error can be retried: {:?}", described_error);
ErrorRecoveryAction::RetryAction
} else if matches!(
described_error.condition,
AmqpErrorCondition::UnauthorizedAccess
| AmqpErrorCondition::ConnectionForced
| AmqpErrorCondition::ConnectionFramingError
) {
debug!(
"AMQP described error requires reconnect: {:?}",
described_error
);
ErrorRecoveryAction::ReconnectConnection
} else if matches!(
described_error.condition,
AmqpErrorCondition::EntityDisabledError
Expand Down Expand Up @@ -717,4 +729,51 @@ mod tests {

assert_eq!(connection_manager.custom_endpoint, Some(custom_endpoint));
}

#[test]
fn test_should_retry_amqp_error() {
use azure_core_amqp::AmqpDescribedError;

// Test ConnectionDropped -> ReconnectConnection
let err = AmqpError::from(AmqpErrorKind::ConnectionDropped(Box::new(
std::io::Error::new(std::io::ErrorKind::ConnectionAborted, "dropped"),
)));
assert_eq!(
RecoverableConnection::should_retry_amqp_error(&err),
ErrorRecoveryAction::ReconnectConnection
);

// Test TimeoutError -> RetryAction
let err = AmqpError::from(AmqpErrorKind::AmqpDescribedError(AmqpDescribedError::new(
AmqpErrorCondition::TimeoutError,
None,
Default::default(),
)));
assert_eq!(
RecoverableConnection::should_retry_amqp_error(&err),
ErrorRecoveryAction::RetryAction
);

// Test ConnectionForced -> ReconnectConnection
let err = AmqpError::from(AmqpErrorKind::AmqpDescribedError(AmqpDescribedError::new(
AmqpErrorCondition::ConnectionForced,
None,
Default::default(),
)));
assert_eq!(
RecoverableConnection::should_retry_amqp_error(&err),
ErrorRecoveryAction::ReconnectConnection
);

// Test UnauthorizedAccess -> ReconnectConnection
let err = AmqpError::from(AmqpErrorKind::AmqpDescribedError(AmqpDescribedError::new(
AmqpErrorCondition::UnauthorizedAccess,
None,
Default::default(),
)));
assert_eq!(
RecoverableConnection::should_retry_amqp_error(&err),
ErrorRecoveryAction::ReconnectConnection
);
}
}