Fix race condition for writing local cache state (#113)

dfederm · web-flow · commit 59da55d37ff1 · 2025-01-07T11:56:15.000-08:00
diff --git a/src/Common/Caching/CacheClient.cs b/src/Common/Caching/CacheClient.cs
@@ -490,13 +490,12 @@ async Task PlaceFilesAsync(CancellationToken ct)
 
             Task placeFilesTask = cacheEntry.PlaceFilesAsync(context, outputsToPlace, ct);
             tasks.Add(placeFilesTask);
+            await Task.WhenAll(tasks);
 
             if (_localCacheStateManager is not null)
             {
                 await _localCacheStateManager.WriteStateFileAsync(nodeContext, nodeBuildResult);
             }
-
-            await Task.WhenAll(tasks);
         }
 
         if (_enableAsyncMaterialization)

Original file line number	Diff line number	Diff line change
`@@ -490,13 +490,12 @@ async Task PlaceFilesAsync(CancellationToken ct)`
`490`	`490`
`491`	`491`	`Task placeFilesTask = cacheEntry.PlaceFilesAsync(context, outputsToPlace, ct);`
`492`	`492`	`tasks.Add(placeFilesTask);`
	`493`	`+ await Task.WhenAll(tasks);`
`493`	`494`
`494`	`495`	`if (_localCacheStateManager is not null)`
`495`	`496`	`{`
`496`	`497`	`await _localCacheStateManager.WriteStateFileAsync(nodeContext, nodeBuildResult);`
`497`	`498`	`}`
`498`		`-`
`499`		`- await Task.WhenAll(tasks);`
`500`	`499`	`}`
`501`	`500`
`502`	`501`	`if (_enableAsyncMaterialization)`