Skip to content

Ensure Service Bus session idle timeout fall back to retry-options::try-timeout #39994

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
anuchandy merged 1 commit into from
May 2, 2024
Merged

Ensure Service Bus session idle timeout fall back to retry-options::try-timeout #39994

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Bugs Fixed

- Fixes the session message disposition to use management node as fall back. ([#39913](https://github.com/Azure/azure-sdk-for-java/issues/ 39913))
- Fixes the session processor idle timeout to fall back to RetryOptions::tryTimeout. ([#39993](https://github.com/Azure/azure-sdk-for-java/issues/39993))

### Other Changes

Expand Down
2 changes: 1 addition & 1 deletion ...essaging-servicebus/src/main/java/com/azure/messaging/servicebus/SessionsMessagePump.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ final class SessionsMessagePump {
this.instrumentation = Objects.requireNonNull(instrumentation, "'instrumentation' cannot be null");
this.sessionAcquirer = Objects.requireNonNull(sessionAcquirer, "'sessionAcquirer' cannot be null");
this.maxSessionLockRenew = Objects.requireNonNull(maxSessionLockRenew, "'maxSessionLockRenew' cannot be null.");
this.sessionIdleTimeout = sessionIdleTimeout;
this.sessionIdleTimeout = sessionIdleTimeout != null ? sessionIdleTimeout : retryPolicy.getRetryOptions().getTryTimeout();
this.maxConcurrentSessions = maxConcurrentSessions;
this.concurrencyPerSession = concurrencyPerSession;
this.prefetch = prefetch;
Expand Down
6 changes: 6 additions & 0 deletions ...essaging-servicebus/src/test/java/com/azure/messaging/servicebus/IntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,16 @@ protected final Configuration v1OrV2(boolean isV2) {
if (isV2) {
configSource.put("com.azure.messaging.servicebus.nonSession.asyncReceive.v2", "true");
configSource.put("com.azure.messaging.servicebus.nonSession.syncReceive.v2", "true");
configSource.put("com.azure.messaging.servicebus.session.processor.asyncReceive.v2", "true");
configSource.put("com.azure.messaging.servicebus.session.reactor.asyncReceive.v2", "true");
configSource.put("com.azure.messaging.servicebus.session.syncReceive.v2", "true");
configSource.put("com.azure.messaging.servicebus.sendAndManageRules.v2", "true");
} else {
configSource.put("com.azure.messaging.servicebus.nonSession.asyncReceive.v2", "false");
configSource.put("com.azure.messaging.servicebus.nonSession.syncReceive.v2", "false");
configSource.put("com.azure.messaging.servicebus.session.processor.asyncReceive.v2", "false");
configSource.put("com.azure.messaging.servicebus.session.reactor.asyncReceive.v2", "false");
configSource.put("com.azure.messaging.servicebus.session.syncReceive.v2", "false");
configSource.put("com.azure.messaging.servicebus.sendAndManageRules.v2", "false");
}
return new ConfigurationBuilder(configSource)
Expand Down