Skip to content
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

[Event Hubs] Try catch handling #4515

Merged
merged 7 commits into from
Jul 30, 2019
+58 −61
Merged

[Event Hubs] Try catch handling #4515

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
260b0e6
[Event Hubs] Introduce timeoutInMs on RetryOptions (#4239)
ramya0820 Jul 11, 2019
c74f5e4
Merge branch 'master' of https://github.com/ramya0820/azure-sdk-for-js
Jul 13, 2019
00016cb
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js
ramya0820 Jul 15, 2019
5c12c13
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js
ramya0820 Jul 16, 2019
2081256
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js
Jul 17, 2019
37d694d
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js in…
Jul 30, 2019
405570a
Update try catch handling
Jul 30, 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
119 changes: 58 additions & 61 deletions sdk/eventhub/event-hubs/src/managementClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,84 +318,81 @@ export class ManagementClient extends LinkEntity {

const sendOperationPromise = () =>
new Promise<Message>(async (resolve, reject) => {
try {
let count = 0;
let count = 0;

const retryTimeoutInMs = getRetryAttemptTimeoutInMs(options.retryOptions);
let timeTakenByInit = 0;
const retryTimeoutInMs = getRetryAttemptTimeoutInMs(options.retryOptions);
let timeTakenByInit = 0;

const rejectOnAbort = () => {
const requestName = options.requestName;
const desc: string =
`[${this._context.connectionId}] The request "${requestName}" ` +
`to has been cancelled by the user.`;
log.error(desc);
const error = new AbortError(
`The ${
requestName ? requestName + " " : ""
}operation has been cancelled by the user.`
);
const rejectOnAbort = () => {
const requestName = options.requestName;
const desc: string =
`[${this._context.connectionId}] The request "${requestName}" ` +
`to has been cancelled by the user.`;
log.error(desc);
const error = new AbortError(
`The ${requestName ? requestName + " " : ""}operation has been cancelled by the user.`
);

reject(error);
};
reject(error);
};

if (aborter) {
if (aborter.aborted) {
return rejectOnAbort();
}
if (aborter) {
if (aborter.aborted) {
return rejectOnAbort();
}
}

if (!this._isMgmtRequestResponseLinkOpen()) {
log.mgmt(
"[%s] Acquiring lock to get the management req res link.",
this._context.connectionId
);

const initOperationStartTime = Date.now();
if (!this._isMgmtRequestResponseLinkOpen()) {
log.mgmt(
"[%s] Acquiring lock to get the management req res link.",
this._context.connectionId
);

const actionAfterTimeout = () => {
const desc: string = `The request with message_id "${request.message_id}" timed out. Please try again later.`;
const e: Error = {
name: "OperationTimeoutError",
message: desc
};
const initOperationStartTime = Date.now();

return reject(translate(e));
const actionAfterTimeout = () => {
const desc: string = `The request with message_id "${request.message_id}" timed out. Please try again later.`;
const e: Error = {
name: "OperationTimeoutError",
message: desc
};

const waitTimer = setTimeout(actionAfterTimeout, retryTimeoutInMs);
return reject(translate(e));
};

const waitTimer = setTimeout(actionAfterTimeout, retryTimeoutInMs);

try {
await defaultLock.acquire(this.managementLock, () => {
return this._init();
});
} catch (err) {
return reject(translate(err));
} finally {
clearTimeout(waitTimer);
}
timeTakenByInit = Date.now() - initOperationStartTime;
try {
await defaultLock.acquire(this.managementLock, () => {
return this._init();
});
} catch (err) {
return reject(translate(err));
} finally {
clearTimeout(waitTimer);
}
timeTakenByInit = Date.now() - initOperationStartTime;
}

const remainingOperationTimeoutInMs = retryTimeoutInMs - timeTakenByInit;
const remainingOperationTimeoutInMs = retryTimeoutInMs - timeTakenByInit;

const sendRequestOptions: SendRequestOptions = {
abortSignal: options.abortSignal,
requestName: options.requestName,
timeoutInSeconds: remainingOperationTimeoutInMs / 1000
};
const sendRequestOptions: SendRequestOptions = {
abortSignal: options.abortSignal,
requestName: options.requestName,
timeoutInSeconds: remainingOperationTimeoutInMs / 1000
};

count++;
if (count !== 1) {
// Generate a new message_id every time after the first attempt
request.message_id = generate_uuid();
} else if (!request.message_id) {
// Set the message_id in the first attempt only if it is not set
request.message_id = generate_uuid();
}
count++;
if (count !== 1) {
// Generate a new message_id every time after the first attempt
request.message_id = generate_uuid();
} else if (!request.message_id) {
// Set the message_id in the first attempt only if it is not set
request.message_id = generate_uuid();
}

try {
const result = await this._mgmtReqResLink!.sendRequest(request, sendRequestOptions);

resolve(result);
} catch (err) {
err = translate(err);
Expand Down