Prevents deadlocks during disposal in indexes.

Introduces a cancellation token to prevent potential deadlocks when disposing of indexes. The change ensures that locks are released when the index is disposed, preventing tasks from waiting indefinitely.

Author: niemyjski

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

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Foundatio.AsyncEx;
 using Foundatio.Parsers.ElasticQueries;
@@ -30,6 +31,7 @@ public class Index : IIndex
     private readonly Lazy<QueryFieldResolver> _fieldResolver;
     private readonly ConcurrentDictionary<string, ICustomFieldType> _customFieldTypes = new();
     private readonly AsyncLock _lock = new();
+    private readonly CancellationTokenSource _disposedCancellationTokenSource = new();
     protected readonly ILogger _logger;
 
     public Index(IElasticConfiguration configuration, string name = null)
@@ -152,7 +154,7 @@ public virtual async Task EnsureIndexAsync(object target)
         if (_isEnsured)
             return;
 
-        using (await _lock.LockAsync().AnyContext())
+        using (await _lock.LockAsync(_disposedCancellationTokenSource.Token).AnyContext())
         {
             if (_isEnsured)
                 return;
@@ -181,7 +183,7 @@ public virtual IPromise<IAliases> ConfigureIndexAliases(AliasesDescriptor aliase
 
     public virtual async Task DeleteAsync()
     {
-        using (await _lock.LockAsync().AnyContext())
+        using (await _lock.LockAsync(_disposedCancellationTokenSource.Token).AnyContext())
         {
             await DeleteIndexAsync(Name).AnyContext();
             _isEnsured = false;
@@ -363,7 +365,11 @@ public virtual CreateIndexDescriptor ConfigureIndex(CreateIndexDescriptor idx)
 
     public virtual void ConfigureSettings(ConnectionSettings settings) { }
 
-    public virtual void Dispose() { }
+    public virtual void Dispose()
+    {
+        _disposedCancellationTokenSource.Cancel();
+        _disposedCancellationTokenSource.Dispose();
+    }
 }
 
 public class Index<T> : Index, IIndex<T> where T : class

tests/Foundatio.Repositories.Elasticsearch.Tests/Repositories/Configuration/Indexes/CalculatedIntegerFieldType.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Foundatio.AsyncEx;
 using Foundatio.Serializer;
@@ -39,12 +40,13 @@ public override async Task<ProcessFieldValueResult> ProcessValueAsync<T>(T docum
     }
 }
 
-public class ScriptService
+public class ScriptService : IDisposable
 {
     private readonly ITextSerializer _serializer;
     private readonly ILogger<ScriptService> _logger;
     private readonly ConcurrentDictionary<string, string> _registeredExpressions = new();
     private readonly AsyncLock _lock = new();
+    private readonly CancellationTokenSource _disposedCancellationTokenSource = new();
 
     public ScriptService(ITextSerializer jsonSerializer, ILogger<ScriptService> logger)
     {
@@ -61,7 +63,7 @@ public ScriptService(ITextSerializer jsonSerializer, ILogger<ScriptService> logg
     /// </summary>
     public async Task<ScriptValueResult> EvaluateForSourceAsync<T>(T source, string expression) where T : class
     {
-        using (await _lock.LockAsync().ConfigureAwait(false))
+        using (await _lock.LockAsync(_disposedCancellationTokenSource.Token).ConfigureAwait(false))
         {
             string functionName = EnsureExpressionFunctionInternal(expression);
             SetSourceInternal(source);
@@ -71,7 +73,7 @@ public async Task<ScriptValueResult> EvaluateForSourceAsync<T>(T source, string
 
     public string EnsureExpressionFunction(string expression)
     {
-        using (_lock.Lock())
+        using (_lock.Lock(_disposedCancellationTokenSource.Token))
         {
             return EnsureExpressionFunctionInternal(expression);
         }
@@ -92,7 +94,7 @@ private string EnsureExpressionFunctionInternal(string expression)
 
     public void RegisterFunction(string name, string body)
     {
-        using (_lock.Lock())
+        using (_lock.Lock(_disposedCancellationTokenSource.Token))
         {
             RegisterFunctionInternal(name, body);
         }
@@ -129,7 +131,7 @@ private void RegisterFunctionInternal(string name, string body)
 
     public void SetSource(object source)
     {
-        using (_lock.Lock())
+        using (_lock.Lock(_disposedCancellationTokenSource.Token))
         {
             SetSourceInternal(source);
         }
@@ -147,7 +149,7 @@ private void SetSourceInternal(object source)
 
     public ScriptValueResult GetValue(string functionName)
     {
-        using (_lock.Lock())
+        using (_lock.Lock(_disposedCancellationTokenSource.Token))
         {
             return GetValueInternal(functionName);
         }
@@ -172,7 +174,7 @@ private ScriptValueResult GetValueInternal(string functionName)
 
     public object ExecuteExpression(string expression)
     {
-        using (_lock.Lock())
+        using (_lock.Lock(_disposedCancellationTokenSource.Token))
         {
             return ExecuteExpressionInternal(expression);
         }
@@ -193,6 +195,12 @@ private object ExecuteExpressionInternal(string expression)
         }
     }
 
+    public void Dispose()
+    {
+        _disposedCancellationTokenSource.Cancel();
+        _disposedCancellationTokenSource.Dispose();
+    }
+
     private static bool IsValidJavaScriptIdentifier(string identifier)
     {
         if (String.IsNullOrEmpty(identifier))