Merge pull request #4106 from microsoft/bugfix/dead-lock-update

bugfix/dead lock update

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Fixed a deadlock on update for multiple clients targeting the same local file.
+
 ## [1.11.0] - 2024-02-01
 
 ### Added

src/Kiota.Builder/KiotaBuilder.cs

@@ -12,6 +12,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using AsyncKeyedLock;
 using DotNet.Globbing;
 using Kiota.Builder.Caching;
 using Kiota.Builder.CodeDOM;
@@ -396,6 +397,11 @@ private void StopLogAndReset(Stopwatch sw, string prefix)
         sw.Reset();
     }
 
+    private static readonly AsyncKeyedLocker<string> localFilesLock = new(o =>
+    {
+        o.PoolSize = 20;
+        o.PoolInitialFill = 1;
+    });
 
     private async Task<Stream> LoadStream(string inputPath, CancellationToken cancellationToken)
     {
@@ -424,7 +430,14 @@ private async Task<Stream> LoadStream(string inputPath, CancellationToken cancel
             try
             {
 #pragma warning disable CA2000 // disposed by caller
-                input = new FileStream(inputPath, FileMode.Open);
+                var inMemoryStream = new MemoryStream();
+                using (await localFilesLock.LockAsync(inputPath, cancellationToken).ConfigureAwait(false))
+                {// To avoid deadlocking on update with multiple clients for the same local description
+                    using var fileStream = new FileStream(inputPath, FileMode.Open);
+                    await fileStream.CopyToAsync(inMemoryStream, cancellationToken).ConfigureAwait(false);
+                }
+                inMemoryStream.Position = 0;
+                input = inMemoryStream;
 #pragma warning restore CA2000
             }
             catch (Exception ex) when (ex is FileNotFoundException ||