gewuyou/GFramework
1
0
Fork 0
mirror of https://github.com/GeWuYou/GFramework.git synced 2026-05-07 00:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(game): 清理 FileStorage 异步存储路径的 MA0004

Browse Source 
- 修复 FileStorage 在锁获取与异步释放路径上的 ConfigureAwait(false) 缺失
- 保持文件锁、临时文件写入和原子替换流程不变
This commit is contained in:
gewuyou 2026-04-25 09:34:19 +08:00
parent 4bb8f4f429
commit bad6c1b108
1 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
GFramework.Game/Storage/FileStorage.cs
View File

@ -143,11 +143,11 @@ public sealed class FileStorage : IFileStorage, IDisposable
ObjectDisposedException.ThrowIf(_disposed, this);
var path = ToPath(key);
await using (await _lockManager.AcquireLockAsync(path).ConfigureAwait(false))
{
if (File.Exists(path))
File.Delete(path);
}
var pathLock = await _lockManager.AcquireLockAsync(path).ConfigureAwait(false);
await using var configuredPathLock = pathLock.ConfigureAwait(false);
if (File.Exists(path))
File.Delete(path);
}
#endregion
@ -178,10 +178,10 @@ public sealed class FileStorage : IFileStorage, IDisposable
ObjectDisposedException.ThrowIf(_disposed, this);
var path = ToPath(key);
await using (await _lockManager.AcquireLockAsync(path).ConfigureAwait(false))
{
return File.Exists(path);
}
var pathLock = await _lockManager.AcquireLockAsync(path).ConfigureAwait(false);
await using var configuredPathLock = pathLock.ConfigureAwait(false);
return File.Exists(path);
}
#endregion
@ -236,23 +236,24 @@ public sealed class FileStorage : IFileStorage, IDisposable
ObjectDisposedException.ThrowIf(_disposed, this);
var path = ToPath(key);
await using (await _lockManager.AcquireLockAsync(path).ConfigureAwait(false))
{
if (!File.Exists(path))
throw new FileNotFoundException($"Storage key not found: {key}", path);
var pathLock = await _lockManager.AcquireLockAsync(path).ConfigureAwait(false);
await using var configuredPathLock = pathLock.ConfigureAwait(false);
await using var fs = new FileStream(
path,
FileMode.Open,
FileAccess.Read,
FileShare.Read,
_bufferSize,
useAsync: true);
if (!File.Exists(path))
throw new FileNotFoundException($"Storage key not found: {key}", path);
using var sr = new StreamReader(fs, Encoding.UTF8);
var content = await sr.ReadToEndAsync().ConfigureAwait(false);
return _serializer.Deserialize<T>(content);
}
var fs = new FileStream(
path,
FileMode.Open,
FileAccess.Read,
FileShare.Read,
_bufferSize,
useAsync: true);
await using var configuredFileStream = fs.ConfigureAwait(false);
using var sr = new StreamReader(fs, Encoding.UTF8);
var content = await sr.ReadToEndAsync().ConfigureAwait(false);
return _serializer.Deserialize<T>(content);
}
#endregion
@ -354,38 +355,42 @@ public sealed class FileStorage : IFileStorage, IDisposable
var path = ToPath(key);
var tempPath = path + ".tmp";
await using (await _lockManager.AcquireLockAsync(path).ConfigureAwait(false))
var pathLock = await _lockManager.AcquireLockAsync(path).ConfigureAwait(false);
await using var configuredPathLock = pathLock.ConfigureAwait(false);
try
{
try
{
var content = _serializer.Serialize(value);
var content = _serializer.Serialize(value);
// 先写入临时文件
await using (var fs = new FileStream(
tempPath,
FileMode.Create,
FileAccess.Write,
FileShare.None,
_bufferSize,
useAsync: true))
{
await using var sw = new StreamWriter(fs, Encoding.UTF8);
await sw.WriteAsync(content).ConfigureAwait(false);
await sw.FlushAsync().ConfigureAwait(false);
}
// 原子性替换目标文件
File.Move(tempPath, path, overwrite: true);
}
catch
// 先写入临时文件
{
// 清理临时文件
if (File.Exists(tempPath))
File.Delete(tempPath);
throw;
var fs = new FileStream(
tempPath,
FileMode.Create,
FileAccess.Write,
FileShare.None,
_bufferSize,
useAsync: true);
await using var configuredFileStream = fs.ConfigureAwait(false);
var sw = new StreamWriter(fs, Encoding.UTF8);
await using var configuredStreamWriter = sw.ConfigureAwait(false);
await sw.WriteAsync(content).ConfigureAwait(false);
await sw.FlushAsync().ConfigureAwait(false);
}
// 原子性替换目标文件
File.Move(tempPath, path, overwrite: true);
}
catch
{
// 清理临时文件
if (File.Exists(tempPath))
File.Delete(tempPath);
throw;
}
}
#endregion
}
}