Skip to content

Commit 80f8d9c

Browse files
SNOW-2882054 improved logging
1 parent 60874ea commit 80f8d9c

File tree

1 file changed

+52
-5
lines changed

1 file changed

+52
-5
lines changed

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

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,13 @@ public FileHeader GetFileHeader(SFFileMetadata fileMetadata)
110110
}
111111
catch (RequestFailedException ex)
112112
{
113-
fileMetadata = HandleFileHeaderErr(ex, fileMetadata);
113+
HandleFileHeaderErr(ex, fileMetadata);
114+
return null;
115+
}
116+
catch (Exception ex)
117+
{
118+
Logger.Error("Blob client unknown get file header error: " + ex.Message);
119+
fileMetadata.resultStatus = ex.Message;
114120
return null;
115121
}
116122

@@ -223,7 +229,14 @@ public void UploadFile(SFFileMetadata fileMetadata, Stream fileBytesStream, SFEn
223229
}
224230
catch (RequestFailedException ex)
225231
{
226-
fileMetadata = HandleUploadFileErr(ex, fileMetadata);
232+
Logger.Error("Blob client request upload error: " + ex.Message);
233+
HandleUploadFileErr(ex, fileMetadata);
234+
return;
235+
}
236+
catch (Exception ex)
237+
{
238+
Logger.Error("Blob client unknown upload error: " + ex.Message);
239+
fileMetadata.resultStatus = ex.Message;
227240
return;
228241
}
229242

@@ -256,7 +269,14 @@ public async Task UploadFileAsync(SFFileMetadata fileMetadata, Stream fileBytesS
256269
}
257270
catch (RequestFailedException ex)
258271
{
259-
fileMetadata = HandleUploadFileErr(ex, fileMetadata);
272+
Logger.Error("Blob client request upload error: " + ex.Message);
273+
HandleUploadFileErr(ex, fileMetadata);
274+
return;
275+
}
276+
catch (Exception ex)
277+
{
278+
Logger.Error("Blob client unknown upload error: " + ex.Message);
279+
fileMetadata.resultStatus = ex.Message;
260280
return;
261281
}
262282

@@ -337,7 +357,14 @@ public void DownloadFile(SFFileMetadata fileMetadata, string fullDstPath, int ma
337357
catch (RequestFailedException ex)
338358
{
339359
File.Delete(fullDstPath);
340-
fileMetadata = HandleDownloadFileErr(ex, fileMetadata);
360+
HandleDownloadFileErr(ex, fileMetadata);
361+
return;
362+
}
363+
catch (Exception ex)
364+
{
365+
File.Delete(fullDstPath);
366+
Logger.Error("Blob client unknown download error: " + ex.Message);
367+
fileMetadata.resultStatus = ex.Message;
341368
return;
342369
}
343370

@@ -370,7 +397,14 @@ public async Task DownloadFileAsync(SFFileMetadata fileMetadata, string fullDstP
370397
catch (RequestFailedException ex)
371398
{
372399
File.Delete(fullDstPath);
373-
fileMetadata = HandleDownloadFileErr(ex, fileMetadata);
400+
HandleDownloadFileErr(ex, fileMetadata);
401+
return;
402+
}
403+
catch (Exception ex)
404+
{
405+
File.Delete(fullDstPath);
406+
Logger.Error("Blob client unknown download error: " + ex.Message);
407+
fileMetadata.resultStatus = ex.Message;
374408
return;
375409
}
376410

@@ -389,6 +423,7 @@ private SFFileMetadata HandleFileHeaderErr(RequestFailedException ex, SFFileMeta
389423
}
390424
else
391425
{
426+
Logger.Error($"Unexpected HTTP status for file header operation: {ex.Status}");
392427
fileMetadata.resultStatus = ResultStatus.ERROR.ToString();
393428
}
394429
return fileMetadata;
@@ -410,6 +445,12 @@ private SFFileMetadata HandleUploadFileErr(RequestFailedException ex, SFFileMeta
410445
{
411446
fileMetadata.resultStatus = ResultStatus.NEED_RETRY.ToString();
412447
}
448+
else
449+
{
450+
String error = $"Unexpected HTTP status for file upload operation: {ex.Status}";
451+
Logger.Error(error);
452+
fileMetadata.resultStatus = error;
453+
}
413454
return fileMetadata;
414455
}
415456

@@ -425,6 +466,12 @@ private SFFileMetadata HandleDownloadFileErr(RequestFailedException ex, SFFileMe
425466
{
426467
fileMetadata.resultStatus = ResultStatus.NEED_RETRY.ToString();
427468
}
469+
else
470+
{
471+
String error = $"Unexpected HTTP status for file download operation: {ex.Status}";
472+
Logger.Error(error);
473+
fileMetadata.resultStatus = error;
474+
}
428475
return fileMetadata;
429476
}
430477
}

0 commit comments

Comments
 (0)