Exclude receiver related changes

Azure · Jul 11, 2019 · 1d1975e · 1d1975e
1 parent 97ae334
commit 1d1975e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/sdk/eventhub/event-hubs/src/eventHubClient.ts b/sdk/eventhub/event-hubs/src/eventHubClient.ts
@@ -35,6 +35,10 @@ export interface RetryOptions {
    * Number of milliseconds to wait between attempts.
    */
   retryInterval?: number;
+  /**
+ * Number of milliseconds to wait for each operation attempt to get completed within.
+ */
+  operationTimeoutInMs?: number;
   // /**
   //  * The maximum value the `retryInterval` gets incremented exponentially between retries.
   //  * Not applicable, when `isExponential` is set to `false`.

diff --git a/sdk/eventhub/event-hubs/src/eventHubSender.ts b/sdk/eventhub/event-hubs/src/eventHubSender.ts
@@ -577,7 +577,15 @@ export class EventHubSender extends LinkEntity {
           this._sender!.on(SenderEvents.rejected, onRejected);
           this._sender!.on(SenderEvents.modified, onModified);
           this._sender!.on(SenderEvents.released, onReleased);
-          waitTimer = setTimeout(actionAfterTimeout, Constants.defaultOperationTimeoutInSeconds * 1000);
+          waitTimer = setTimeout(
+            actionAfterTimeout,
+            options == undefined ||
+              options.retryOptions == undefined ||
+              options.retryOptions.operationTimeoutInMs == undefined ||
+              options.retryOptions.operationTimeoutInMs < 0
+              ? Constants.defaultOperationTimeoutInSeconds * 1000
+              : options.retryOptions.operationTimeoutInMs
+          );
           const delivery = this._sender!.send(message, tag, 0x80013700);
           log.sender(
             "[%s] Sender '%s', sent message with delivery id: %d and tag: %s",

diff --git a/sdk/eventhub/event-hubs/src/managementClient.ts b/sdk/eventhub/event-hubs/src/managementClient.ts
@@ -280,7 +280,7 @@ export class ManagementClient extends LinkEntity {
    */
   private async _makeManagementRequest(
     request: Message,
-    options?: { retryOptions?: RetryOptions; timeout?: number; abortSignal?: AbortSignalLike; requestName?: string }
+    options?: { retryOptions?: RetryOptions; abortSignal?: AbortSignalLike; requestName?: string }
   ): Promise<any> {
     try {
       log.mgmt("[%s] Acquiring lock to get the management req res link.", this._context.connectionId);
@@ -296,6 +296,12 @@ export class ManagementClient extends LinkEntity {
         maxRetries: options.retryOptions && options.retryOptions.maxRetries,
         abortSignal: options.abortSignal,
         requestName: options.requestName,
+        timeoutInSeconds:
+          options.retryOptions == undefined ||
+          options.retryOptions.operationTimeoutInMs == undefined ||
+          options.retryOptions.operationTimeoutInMs < 0
+            ? Constants.defaultOperationTimeoutInSeconds
+            : options.retryOptions.operationTimeoutInMs / 1000,
         delayInSeconds:
           options.retryOptions && options.retryOptions.retryInterval && options.retryOptions.retryInterval >= 0
             ? options.retryOptions.retryInterval / 1000