Merge remote-tracking branch 'origin/development' into local-staged-release

Author: aws-sdk-dotnet-automation

generator/.DevConfigs/da5f5892-75e9-425e-8dd6-4ae3cda8530a.json

@@ -0,0 +1,9 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [ "Fixed an issue where CancellationToken for async call was not passed along in underlying invocations while uploading unseekable steam using Multipart Upload." ]
+    }
+  ]
+}

sdk/src/Services/S3/Custom/Transfer/Internal/_async/MultipartUploadCommand.async.cs

@@ -187,6 +187,7 @@ private void AbortMultipartUpload(string uploadId)
         }
         private async Task UploadUnseekableStreamAsync(TransferUtilityUploadRequest request, CancellationToken cancellationToken = default(CancellationToken))
         {
+            cancellationToken.ThrowIfCancellationRequested();
 
             int READ_BUFFER_SIZE = this._s3Client.Config.BufferSize;
 
@@ -201,7 +202,7 @@ private void AbortMultipartUpload(string uploadId)
             };
 
             var initiateRequest = ConstructInitiateMultipartUploadRequest(requestEventHandler);
-            var initiateResponse = await _s3Client.InitiateMultipartUploadAsync(initiateRequest).ConfigureAwait(false);
+            var initiateResponse = await _s3Client.InitiateMultipartUploadAsync(initiateRequest, cancellationToken).ConfigureAwait(false);
 
             try
             {
@@ -219,14 +220,14 @@ private void AbortMultipartUpload(string uploadId)
                         int partNumber = 1;
                         int readBytesCount, readAheadBytesCount = 0;
 
-                        readBytesCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false);
+                        readBytesCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length, cancellationToken).ConfigureAwait(false);
 
                         do
                         {
-                            await nextUploadBuffer.WriteAsync(readBuffer, 0, readBytesCount).ConfigureAwait(false);
+                            await nextUploadBuffer.WriteAsync(readBuffer, 0, readBytesCount, cancellationToken).ConfigureAwait(false);
                             // read the stream ahead and process it in the next iteration.
                             // this is used to set isLastPart when there is no data left in the stream.
-                            readAheadBytesCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false);
+                            readAheadBytesCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length, cancellationToken).ConfigureAwait(false);
                             if ((nextUploadBuffer.Position > minPartSize || readAheadBytesCount == 0))
                             {
                                 if (nextUploadBuffer.Position == 0)
@@ -247,7 +248,7 @@ private void AbortMultipartUpload(string uploadId)
                                 nextUploadBuffer.Position = 0;
                                 UploadPartRequest uploadPartRequest = ConstructUploadPartRequestForNonSeekableStream(nextUploadBuffer, partNumber, partSize, isLastPart, initiateResponse);
 
-                                var partResponse = await _s3Client.UploadPartAsync(uploadPartRequest).ConfigureAwait(false);
+                                var partResponse = await _s3Client.UploadPartAsync(uploadPartRequest, cancellationToken).ConfigureAwait(false);
                                 Logger.DebugFormat("Uploaded part {0}. (Last part = {1}, Part size = {2}, Upload Id: {3})", partNumber, isLastPart, partSize, initiateResponse.UploadId);
                                 uploadPartResponses.Add(partResponse);
                                 partNumber++;
@@ -269,7 +270,7 @@ private void AbortMultipartUpload(string uploadId)
 
                     this._uploadResponses = uploadPartResponses;
                     CompleteMultipartUploadRequest compRequest = ConstructCompleteMultipartUploadRequest(initiateResponse, true, requestEventHandler);
-                    await _s3Client.CompleteMultipartUploadAsync(compRequest).ConfigureAwait(false);
+                    await _s3Client.CompleteMultipartUploadAsync(compRequest, cancellationToken).ConfigureAwait(false);
                     Logger.DebugFormat("Completed multi part upload. (Part count: {0}, Upload Id: {1})", uploadPartResponses.Count, initiateResponse.UploadId);
                 }
             }