Write in logger to Azure Storage and error handler. (#804)

* Write in logger to Azure Storage and error handler. * Remove spurious error message * Fix iterator persistence
microsoft · Mar 16, 2023 · 63a9b9d · 63a9b9d
1 parent 3d09097
commit 63a9b9d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/cs/src/core/FasterLog/FasterLogRecoveryInfo.cs b/cs/src/core/FasterLog/FasterLogRecoveryInfo.cs
@@ -239,7 +239,8 @@ public void CommitIterators(ConcurrentDictionary<string, FasterLogScanIterator>
             {
                 foreach (var kvp in Iterators)
                 {
-                    persistedIterators[kvp.Key].UpdateCompletedUntilAddress(kvp.Value);
+                    if (persistedIterators.TryGetValue(kvp.Key, out FasterLogScanIterator iterator))
+                        iterator.UpdateCompletedUntilAddress(kvp.Value);
                 }
             }
         }

diff --git a/cs/src/devices/AzureStorageDevice/AzureStorageNamedDeviceFactory.cs b/cs/src/devices/AzureStorageDevice/AzureStorageNamedDeviceFactory.cs
@@ -1,4 +1,5 @@
 using FASTER.core;
+using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,23 +14,27 @@ public class AzureStorageNamedDeviceFactory : INamedDeviceFactory
         readonly BlobUtilsV12.ServiceClients pageBlobAccount;
         BlobUtilsV12.ContainerClients pageBlobContainer;
         BlobUtilsV12.BlobDirectory pageBlobDirectory;
+        readonly ILogger logger;
 
         /// <summary>
         /// Create instance of factory for Azure devices
         /// </summary>
         /// <param name="connectionString"></param>
-        public AzureStorageNamedDeviceFactory(string connectionString)
-            : this(BlobUtilsV12.GetServiceClients(connectionString))
+        /// <param name="logger"></param>
+        public AzureStorageNamedDeviceFactory(string connectionString, ILogger logger = null)
+            : this(BlobUtilsV12.GetServiceClients(connectionString), logger)
         {
         }
 
         /// <summary>
         /// Create instance of factory for Azure devices
         /// </summary>
         /// <param name="pageBlobAccount"></param>
-        AzureStorageNamedDeviceFactory(BlobUtilsV12.ServiceClients pageBlobAccount)
+        /// <param name="logger"></param>
+        AzureStorageNamedDeviceFactory(BlobUtilsV12.ServiceClients pageBlobAccount, ILogger logger = null)
         {
             this.pageBlobAccount = pageBlobAccount;
+            this.logger = logger;
         }
 
         /// <inheritdoc />
@@ -76,7 +81,7 @@ public void Delete(FileDescriptor fileInfo)
         /// <inheritdoc />
         public IDevice Get(FileDescriptor fileInfo)
         {
-            return new AzureStorageDevice(fileInfo.fileName, pageBlobDirectory.GetSubDirectory(fileInfo.directoryName), null, false);
+            return new AzureStorageDevice(fileInfo.fileName, pageBlobDirectory.GetSubDirectory(fileInfo.directoryName), null, false, false, logger);
         }
 
         /// <inheritdoc />

diff --git a/cs/src/devices/AzureStorageDevice/BlobEntry.cs b/cs/src/devices/AzureStorageDevice/BlobEntry.cs
@@ -55,11 +55,6 @@ public BlobEntry(AzureStorageDevice azureStorageDevice)
         /// <param name="pageBlob">The page blob to create</param>
         public async Task CreateAsync(long size, BlobUtilsV12.PageBlobClients pageBlob)
         {
-            if (this.waitingCount != 0)
-            {
-                this.azureStorageDevice.BlobManager?.HandleStorageError(nameof(CreateAsync), "expect to be called on blobs that don't already exist and exactly once", pageBlob.Default?.Name, null, false, false);
-            }
-
             await this.azureStorageDevice.BlobManager.PerformWithRetriesAsync(
                 this.azureStorageDevice.BlobManager.AsynchronousStorageReadMaxConcurrency,
                 true,

diff --git a/cs/src/devices/AzureStorageDevice/BlobManager.cs b/cs/src/devices/AzureStorageDevice/BlobManager.cs
@@ -87,7 +87,7 @@ internal BlobManager(
             this.leaseBlobDirectory = leaseBlobDirectory;
             this.LeaseBlobName = leaseBlobName ?? LeaseBlobName;
             this.TraceHelper = new FasterTraceHelper(logger, logLevelLimit, performanceLogger);
-            this.StorageErrorHandler = errorHandler ?? new StorageErrorHandler(null, logLevelLimit, null, null);
+            this.StorageErrorHandler = errorHandler ?? new StorageErrorHandler(logger, logLevelLimit, null, null);
             this.shutDownOrTermination = errorHandler == null ?
                 new CancellationTokenSource() :
                 CancellationTokenSource.CreateLinkedTokenSource(errorHandler.Token);