Skip to content

optimize DistributedLocker #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2025
Merged

optimize DistributedLocker #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Infrastructure/BotSharp.Abstraction/Infrastructures/IDistributedLocker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ namespace BotSharp.Abstraction.Infrastructures;

public interface IDistributedLocker
{
bool Lock(string resource, Action action, int timeout = 30);
Task<bool> LockAsync(string resource, Func<Task> action, int timeout = 30);
bool Lock(string resource, Action action, int timeout = 30, int acquireTimeout = default);
Task<bool> LockAsync(string resource, Func<Task> action, int timeout = 30, int acquireTimeout = default);
}
18 changes: 10 additions & 8 deletions src/Infrastructure/BotSharp.Core/Infrastructures/DistributedLocker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ public DistributedLocker(
_logger = logger;
}

public async Task<bool> LockAsync(string resource, Func<Task> action, int timeoutInSeconds = 30)
public async Task<bool> LockAsync(string resource, Func<Task> action, int timeoutInSeconds = 30, int acquireTimeoutInSeconds = default)
{
var timeout = TimeSpan.FromSeconds(timeoutInSeconds);
var acquireTimeout = TimeSpan.FromSeconds(acquireTimeoutInSeconds);

var redis = _services.GetService<IConnectionMultiplexer>();
if (redis == null)
Expand All @@ -31,12 +32,12 @@ public async Task<bool> LockAsync(string resource, Func<Task> action, int timeou
return true;
}

var @lock = new RedisDistributedLock(resource, redis.GetDatabase());
await using (var handle = await @lock.TryAcquireAsync(timeout))
var @lock = new RedisDistributedLock(resource, redis.GetDatabase(),option => option.Expiry(timeout));
await using (var handle = await @lock.TryAcquireAsync(acquireTimeout))
{
if (handle == null)
{
_logger.LogWarning($"Acquire lock for {resource} failed due to after {timeout}s timeout.");
_logger.LogWarning($"Acquire lock for {resource} failed due to after {acquireTimeout}s timeout.");
return false;
}

Expand All @@ -45,9 +46,10 @@ public async Task<bool> LockAsync(string resource, Func<Task> action, int timeou
}
}

public bool Lock(string resource, Action action, int timeoutInSeconds = 30)
public bool Lock(string resource, Action action, int timeoutInSeconds = 30, int acquireTimeoutInSeconds = default)
{
var timeout = TimeSpan.FromSeconds(timeoutInSeconds);
var acquireTimeout = TimeSpan.FromSeconds(acquireTimeoutInSeconds);

var redis = _services.GetRequiredService<IConnectionMultiplexer>();
if (redis == null)
Expand All @@ -59,12 +61,12 @@ public bool Lock(string resource, Action action, int timeoutInSeconds = 30)
return false;
}

var @lock = new RedisDistributedLock(resource, redis.GetDatabase());
using (var handle = @lock.TryAcquire(timeout))
var @lock = new RedisDistributedLock(resource, redis.GetDatabase(), option => option.Expiry(timeout));
using (var handle = @lock.TryAcquire(acquireTimeout))
{
if (handle == null)
{
_logger.LogWarning($"Acquire lock for {resource} failed due to after {timeout}s timeout.");
_logger.LogWarning($"Acquire lock for {resource} failed due to after {acquireTimeout}s timeout.");
return false;
}
else
Expand Down
Loading