Skip to content

[Service Bus] Timeout for message settlement should result in rejected promise #2886

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
ramya-rao-a merged 2 commits into from
May 14, 2019
+21 −5
Merged

[Service Bus] Timeout for message settlement should result in rejected promise #2886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e05d297
[Service Bus] Timeout for message settlement should result in rejecte…
ramya-rao-a May 14, 2019
45f2677
Merge branch 'master' into msg-settle-timeout
ramya-rao-a May 14, 2019
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
14 changes: 11 additions & 3 deletions sdk/servicebus/service-bus/src/core/messageReceiver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {
retry,
RetryOperationType,
RetryConfig,
ConditionErrorNameMapper
ConditionErrorNameMapper,
ErrorNameConditionMapper
} from "@azure/amqp-common";
import {
Receiver,
Expand Down Expand Up @@ -880,12 +881,19 @@ export class MessageReceiver extends LinkEntity {

log.receiver(
"[%s] Disposition for delivery id: %d, did not complete in %d milliseconds. " +
"Hence resolving the promise.",
"Hence rejecting the promise with timeout error.",
this._context.namespace.connectionId,
delivery.id,
messageDispositionTimeout
);
return resolve();

const e: AmqpError = {
condition: ErrorNameConditionMapper.ServiceUnavailableError,
description:
"Operation to settle the message has timed out. The disposition of the " +
"message may or may not be successful"
};
return reject(translate(e));
}, messageDispositionTimeout);
this._deliveryDispositionMap.set(delivery.id, {
resolve: resolve,
Expand Down
12 changes: 10 additions & 2 deletions sdk/servicebus/service-bus/src/session/messageSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
EventContext,
ReceiverOptions,
ReceiverEvents,
AmqpError,
isAmqpError
} from "rhea-promise";
import * as log from "../log";
Expand Down Expand Up @@ -937,12 +938,19 @@ export class MessageSession extends LinkEntity {
this._deliveryDispositionMap.delete(delivery.id);
log.receiver(
"[%s] Disposition for delivery id: %d, did not complete in %d milliseconds. " +
"Hence resolving the promise.",
"Hence rejecting the promise with timeout error",
this._context.namespace.connectionId,
delivery.id,
messageDispositionTimeout
);
return resolve();

const e: AmqpError = {
condition: ErrorNameConditionMapper.ServiceUnavailableError,
description:
"Operation to settle the message has timed out. The disposition of the " +
"message may or may not be successful"
};
return reject(translate(e));
}, messageDispositionTimeout);
this._deliveryDispositionMap.set(delivery.id, {
resolve: resolve,
Expand Down