SNOW-2882054 fixed retries for failures scenarios during blob upload

Author: sfc-gh-mhofman

CHANGELOG.md

@@ -1,6 +1,8 @@
 #### For the official .NET Release Notes please refer to https://docs.snowflake.com/en/release-notes/clients-drivers/dotnet
 
 # Changelog
+- v5.2.1
+    - Bug fix: Fixed for intermittent network issues during Azure blob storage upload operations
 - v5.2.0
     - Added multi-targeting support. The appropriate build is selected by NuGet based on target framework and OS.
     - Fixed CRL validation to reject newly downloaded CRLs if their NextUpdate has already expired.

Snowflake.Data/Core/FileTransfer/StorageClient/SFSnowflakeAzureClient.cs

@@ -116,7 +116,7 @@ public FileHeader GetFileHeader(SFFileMetadata fileMetadata)
             catch (Exception ex)
             {
                 Logger.Error("Blob client unknown get file header error: " + ex.Message);
-                fileMetadata.resultStatus = ex.Message;
+                fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
                 return null;
             }
 
@@ -145,7 +145,13 @@ public async Task<FileHeader> GetFileHeaderAsync(SFFileMetadata fileMetadata, Ca
             }
             catch (RequestFailedException ex)
             {
-                fileMetadata = HandleFileHeaderErr(ex, fileMetadata);
+                HandleFileHeaderErr(ex, fileMetadata);
+                return null;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error("Blob client unknown get file header error: " + ex.Message);
+                fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
                 return null;
             }
 
@@ -174,6 +180,11 @@ internal FileHeader HandleFileHeaderResponse(ref SFFileMetadata fileMetadata, Bl
                 };
             }
 
+            if (fileMetadata.stageInfo.isClientSideEncrypted && encryptionMetadata == null)
+            {
+                Logger.Error("File is expected to be client-side encrypted but no encryption metadata found.");
+            }
+
             return new FileHeader
             {
                 digest = GetMetadataValueCaseInsensitive(response, "sfcdigest", false),
@@ -236,7 +247,7 @@ public void UploadFile(SFFileMetadata fileMetadata, Stream fileBytesStream, SFEn
             catch (Exception ex)
             {
                 Logger.Error("Blob client unknown upload error: " + ex.Message);
-                fileMetadata.resultStatus = ex.Message;
+                fileMetadata.resultStatus = ResultStatus.NEED_RETRY.ToString();
                 return;
             }
 
@@ -265,7 +276,7 @@ public async Task UploadFileAsync(SFFileMetadata fileMetadata, Stream fileBytesS
                 {
                     Metadata = metadata
                 };
-                blobClient.UploadAsync(fileBytesStream, uploadOptions, cancellationToken).ConfigureAwait(false);
+                await blobClient.UploadAsync(fileBytesStream, uploadOptions, cancellationToken).ConfigureAwait(false);
             }
             catch (RequestFailedException ex)
             {
@@ -276,7 +287,7 @@ public async Task UploadFileAsync(SFFileMetadata fileMetadata, Stream fileBytesS
             catch (Exception ex)
             {
                 Logger.Error("Blob client unknown upload error: " + ex.Message);
-                fileMetadata.resultStatus = ex.Message;
+                fileMetadata.resultStatus = ResultStatus.NEED_RETRY.ToString();
                 return;
             }
 
@@ -364,7 +375,7 @@ public void DownloadFile(SFFileMetadata fileMetadata, string fullDstPath, int ma
             {
                 File.Delete(fullDstPath);
                 Logger.Error("Blob client unknown download error: " + ex.Message);
-                fileMetadata.resultStatus = ex.Message;
+                fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
                 return;
             }
 
@@ -404,7 +415,7 @@ public async Task DownloadFileAsync(SFFileMetadata fileMetadata, string fullDstP
             {
                 File.Delete(fullDstPath);
                 Logger.Error("Blob client unknown download error: " + ex.Message);
-                fileMetadata.resultStatus = ex.Message;
+                fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
                 return;
             }
 
@@ -449,7 +460,7 @@ private SFFileMetadata HandleUploadFileErr(RequestFailedException ex, SFFileMeta
             {
                 String error = $"Unexpected HTTP status for file upload operation: {ex.Status}";
                 Logger.Error(error);
-                fileMetadata.resultStatus = error;
+                fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
             }
             return fileMetadata;
         }
@@ -470,7 +481,7 @@ private SFFileMetadata HandleDownloadFileErr(RequestFailedException ex, SFFileMe
             {
                 String error = $"Unexpected HTTP status for file download operation: {ex.Status}";
                 Logger.Error(error);
-                fileMetadata.resultStatus = error;
+                fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
             }
             return fileMetadata;
         }