Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a concurrency issue with job provider.

This commit is contained in:
kay.one 2011-05-19 23:25:39 -07:00
parent 8fca3c3419
commit 0d02b0538b
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NzbDrone.Core.Test/JobProviderTest.cs
View File

@ -100,6 +100,29 @@ namespace NzbDrone.Core.Test
} }
[Test]
//This test will confirm that the concurrency checks are rest
//after execution so the job can successfully run.
public void no_concurent_jobs()
{
IEnumerable<IJob> fakeJobs = new List<IJob> { new SlowJob() };
var mocker = new AutoMoqer();
mocker.SetConstant(MockLib.GetEmptyRepository());
mocker.SetConstant(fakeJobs);
var timerProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize();
var firstRun = timerProvider.QueueJob(typeof(SlowJob),1);
var secondRun = timerProvider.QueueJob(typeof(SlowJob),2);
var third = timerProvider.QueueJob(typeof(SlowJob),3);
Thread.Sleep(10000);
}
[Test] [Test]
//This test will confirm that the concurrency checks are rest //This test will confirm that the concurrency checks are rest
//after execution so the job can successfully run. //after execution so the job can successfully run.
@ -436,8 +459,10 @@ namespace NzbDrone.Core.Test
public void Start(ProgressNotification notification, int targetId) public void Start(ProgressNotification notification, int targetId)
{ {
Console.WriteLine("Starting Job");
Thread.Sleep(2000); Thread.Sleep(2000);
ExexutionCount++; ExexutionCount++;
Console.WriteLine("Finishing Job");
} }
} }
} }

7
NzbDrone.Core/Providers/Jobs/JobProvider.cs
View File

@ -106,7 +106,7 @@ namespace NzbDrone.Core.Providers.Jobs
/// <param name="jobType">Type of the job that should be executed.</param> /// <param name="jobType">Type of the job that should be executed.</param>
/// <param name="targetId">The targetId could be any Id parameter eg. SeriesId. it will be passed to the job implementation /// <param name="targetId">The targetId could be any Id parameter eg. SeriesId. it will be passed to the job implementation
/// to allow it to filter it's target of execution.</param> /// to allow it to filter it's target of execution.</param>
/// <returns>True if ran, false if skipped</returns> /// <returns>True if queued, false if duplicate and was skipped</returns>
/// <remarks>Job is only added to the queue if same job with the same targetId doesn't already exist in the queue.</remarks> /// <remarks>Job is only added to the queue if same job with the same targetId doesn't already exist in the queue.</remarks>
public virtual bool QueueJob(Type jobType, int targetId = 0) public virtual bool QueueJob(Type jobType, int targetId = 0)
{ {
@ -133,7 +133,7 @@ namespace NzbDrone.Core.Providers.Jobs
Logger.Trace("Queue is already running. Ignoring request."); Logger.Trace("Queue is already running. Ignoring request.");
return true; return true;
} }
_isRunning = true;
} }
if (_jobThread == null || !_jobThread.IsAlive) if (_jobThread == null || !_jobThread.IsAlive)
@ -158,7 +158,8 @@ namespace NzbDrone.Core.Providers.Jobs
} }
else else
{ {
Logger.Warn("Thread still active. Ignoring request."); Logger.Warn("Execution lock has has fucked up. Thread still active. Ignoring request.");
return true;
} }
return true; return true;