Fixed a multithreading bug where index can be called multiple times.

Author: niemyjski

src/Foundatio.Repositories.Elasticsearch/Configuration/Index.cs

@@ -1,8 +1,10 @@
-using System;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using Foundatio.AsyncEx;
 using Foundatio.Parsers.ElasticQueries;
 using Foundatio.Parsers.ElasticQueries.Extensions;
 using Foundatio.Parsers.LuceneQueries.Visitors;
@@ -26,8 +28,9 @@ public class Index : IIndex
     private readonly Lazy<ElasticQueryParser> _queryParser;
     private readonly Lazy<ElasticMappingResolver> _mappingResolver;
     private readonly Lazy<QueryFieldResolver> _fieldResolver;
+    private readonly ConcurrentDictionary<string, ICustomFieldType> _customFieldTypes = new();
+    private readonly AsyncLock _lock = new();
     protected readonly ILogger _logger;
-    private readonly IDictionary<string, ICustomFieldType> _customFieldTypes = new Dictionary<string, ICustomFieldType>();
 
     public Index(IElasticConfiguration configuration, string name = null)
     {
@@ -149,14 +152,14 @@ public virtual async Task EnsureIndexAsync(object target)
         if (_isEnsured)
             return;
 
-        bool existsResult = await IndexExistsAsync(Name).AnyContext();
-        if (existsResult)
+        using (await _lock.LockAsync().AnyContext())
         {
+            if (_isEnsured)
+                return;
+
+            await ConfigureAsync().AnyContext();
             _isEnsured = true;
-            return;
         }
-
-        await ConfigureAsync().AnyContext();
     }
 
     public virtual Task MaintainAsync(bool includeOptionalTasks = true)
@@ -178,6 +181,7 @@ public virtual IPromise<IAliases> ConfigureIndexAliases(AliasesDescriptor aliase
 
     public virtual Task DeleteAsync()
     {
+        _isEnsured = false;
         return DeleteIndexAsync(Name);
     }
 

src/Foundatio.Repositories/Extensions/TaskExtensions.cs

@@ -1,6 +1,8 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Foundatio.AsyncEx;
 
 namespace Foundatio.Repositories.Extensions;
 
@@ -17,4 +19,10 @@ public static ConfiguredTaskAwaitable AnyContext(this Task task)
     {
         return task.ConfigureAwait(continueOnCapturedContext: false);
     }
+
+    [DebuggerStepThrough]
+    public static ConfiguredTaskAwaitable<TResult> AnyContext<TResult>(this AwaitableDisposable<TResult> task) where TResult : IDisposable
+    {
+        return task.ConfigureAwait(continueOnCapturedContext: false);
+    }
 }