lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Deletes lock records when Count reaches 0.

Browse Source 
Also some minor polishing and changed ObjectDisposedException to OrchardException in case a lock was already released.
This commit is contained in:
Sipke Schoorstra
2015-09-02 11:43:12 +01:00
parent 553a0e260a
commit db03498cfa
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Orchard.Tests/Tasks/DistributedLockServiceTests.cs
View File

@@ -82,10 +82,19 @@ namespace Orchard.Tests.Tasks {
_distributedLockService.ReleaseLock(@lock);
_session.Refresh(lockRecord);
Assert.That(lockRecord.Count, Is.EqualTo(1));
}
[Test]
public void ReleasingLockAndCountReachesZeroDeletesLock()
{
DistributedLock @lock;
_distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
var lockId = Int32.Parse(@lock.Id);
_distributedLockService.ReleaseLock(@lock);
_session.Refresh(lockRecord);
Assert.That(lockRecord.Count, Is.EqualTo(0));
var lockRecord = _distributedLockRepository.Get(lockId);
Assert.That(lockRecord, Is.Null);
}
[Test]

18
src/Orchard/Tasks/Locking/Services/DistributedLockService.cs
View File

@@ -52,12 +52,15 @@ namespace Orchard.Tasks.Locking.Services {
var record = repository.Get(lockId);
if (record == null)
throw new ObjectDisposedException("@lock", "No lock record could be found for the specified lock to be released.");
throw new OrchardException(T("No lock record could be found for the specified lock to be released."));
if (record.Count <= 0)
throw new ObjectDisposedException("@lock", "The specified lock has already been released.");
throw new OrchardException(T("The specified lock has already been released."));
record.Count--;
if(record.Count == 0)
repository.Delete(record);
}
catch (Exception ex) {
if (ex.IsFatal()) throw;
@@ -70,10 +73,7 @@ namespace Orchard.Tasks.Locking.Services {
private bool TryAcquireLock(string name, TimeSpan? maxValidFor, TimeSpan? timeout, string machineName, int? threadId, out DistributedLock @lock) {
@lock = AcquireLock(name, maxValidFor, machineName, threadId, timeout ?? TimeSpan.Zero);
if (@lock != null)
return true;
return false;
return @lock != null;
}
private DistributedLock AcquireLock(string name, TimeSpan? maxValidFor, TimeSpan? timeout, string machineName, int? threadId) {
@@ -171,15 +171,15 @@ namespace Orchard.Tasks.Locking.Services {
/// <summary>
/// Executes the specified function until it returns true, for the specified amount of time, or indefinitely if no timeout was given.
/// </summary>
/// <param name="pollFunc">The function to repeatedly execute until it returns true.</param>
/// <param name="operation">The operation to repeatedly execute until it returns true.</param>
/// <param name="timeout">The amount of time to retry executing the function. If null is specified, the specified function is executed indefinitely until it returns true.</param>
/// <returns>Returns true if the specified function returned true within the specified timeout, false otherwise.</returns>
private bool Poll(Func<bool> pollFunc, TimeSpan? timeout) {
private bool Poll(Func<bool> operation, TimeSpan? timeout) {
var waitedTime = TimeSpan.Zero;
var waitTime = TimeSpan.FromMilliseconds(timeout.GetValueOrDefault().TotalMilliseconds / 10);
bool acquired;
while (!(acquired = pollFunc()) && (timeout == null || waitedTime < timeout.Value)) {
while (!(acquired = operation()) && (timeout == null || waitedTime < timeout.Value)) {
Task.Delay(waitTime).ContinueWith(t => {
waitedTime += waitTime;
}).Wait();