version++

Common.targets

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <Version>0.0.17</Version>
-    <AssemblyVersion>0.0.17</AssemblyVersion>
-    <FileVersion>0.0.17</FileVersion>
+    <Version>0.0.18</Version>
+    <AssemblyVersion>0.0.18</AssemblyVersion>
+    <FileVersion>0.0.18</FileVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Χρόνος -->

src/K4os.Xpovoc.Core/Db/DbPoller.cs

@@ -93,39 +93,38 @@ private async Task<IDbJob> Claim(CancellationToken token)
 		[SuppressMessage("ReSharper", "AccessToDisposedClosure")]
 		private async Task Process(CancellationToken token, IDbJob job)
 		{
-			// this seems like performance drag for not reason
+			// this seems like performance drag for no reason
 			// if job is hijacked do we need to try to interrupt it?
-			using (var hijacked = new CancellationTokenSource())
-			using (var combined = CancellationTokenSource
-				.CreateLinkedTokenSource(token, hijacked.Token))
-			using (var finished = new CancellationTokenSource())
+			using var hijacked = new CancellationTokenSource();
+			using var combined = CancellationTokenSource
+				.CreateLinkedTokenSource(token, hijacked.Token);
+			using var finished = new CancellationTokenSource();
+
+			var keepAlive = Task.Run(
+				() => MaintainClaim(finished.Token, job, hijacked),
+				CancellationToken.None);
+
+			var success = await Handle(combined.Token, job);
+
+			if (await CancelClaim(finished, hijacked, keepAlive))
 			{
-				var keepAlive = Task.Run(
-					() => MaintainClaim(finished.Token, job, hijacked),
-					CancellationToken.None);
-
-				var success = await Handle(combined.Token, job);
-
-				if (await CancelClaim(finished, hijacked, keepAlive))
+				if (success)
 				{
-					if (success)
-					{
-						await Complete(job);
-					}
-					else if (job.Attempt < _configuration.RetryLimit)
-					{
-						await Retry(job);
-					}
-					else
-					{
-						await Forget(job);
-					}
+					await Complete(job);
+				}
+				else if (job.Attempt < _configuration.RetryLimit)
+				{
+					await Retry(job);
 				}
 				else
 				{
-					Log.LogError("Execution of job {0} has been hijacked", job.JobId);
+					await Forget(job);
 				}
 			}
+			else
+			{
+				Log.LogError("Execution of job {0} has been hijacked", job.JobId);
+			}
 		}
 
 		private async Task<bool> Handle(CancellationToken token, IDbJob job)

src/K4os.Xpovoc.Core/K4os.Xpovoc.Core.csproj

@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\K4os.Shared\Extensions.cs">

src/K4os.Xpovoc.Core/Memory/MemoryJobStorage.cs

@@ -16,13 +16,9 @@ namespace K4os.Xpovoc.Core.Memory
 	/// </summary>
 	public class MemoryJobStorage: IDbJobStorage
 	{
-		private readonly object _lock = new object();
-
-		private readonly Dictionary<Guid, MemoryJob> _jobs = 
-			new Dictionary<Guid, MemoryJob>();
-		private readonly SortedSet<(DateTime, Guid)> _queue = 
-			new SortedSet<(DateTime, Guid)>();
-
+		private readonly object _lock = new();
+		private readonly Dictionary<Guid, MemoryJob> _jobs = new();
+		private readonly SortedSet<(DateTime, Guid)> _queue = new();
 		private static readonly Task<IDbJob> NullJob = Task.FromResult<IDbJob>(null);
 
 		public Task<IDbJob> Claim(
@@ -33,10 +29,10 @@ public Task<IDbJob> Claim(
 				var job = FirstVisibleJob(now);
 				if (job is null) return NullJob;
 
-				_queue.Remove((job.ScheduledFor, job.JobId));
+				_queue.Remove((job.InvisibleUntil, job.JobId));
 				job.Context = worker;
 				job.Attempt++;
-				
+
 				return Task.FromResult<IDbJob>(job);
 			}
 		}
@@ -48,10 +44,7 @@ private MemoryJob FirstVisibleJob(DateTime now)
 			{
 				if (time > now) break; // no more candidates
 
-				var job = _jobs[id];
-				if (job.InvisibleUntil > now) continue; // hidden, try next
-
-				return job; // that's the one
+				return _jobs[id]; // that's the one
 			}
 
 			return null;
@@ -63,7 +56,6 @@ public Task<bool> KeepClaim(
 			lock (_lock)
 				return Task.FromResult(job.Context as Guid? == worker);
 		}
-
 
 		public Task Complete(Guid worker, IDbJob job, DateTime now)
 		{
@@ -93,7 +85,7 @@ public Task Retry(Guid worker, IDbJob job, DateTime when)
 				var entry = _jobs[jobId];
 				entry.InvisibleUntil = when;
 				entry.Context = null;
-				_queue.Add((entry.ScheduledFor, entry.JobId));
+				_queue.Add((entry.InvisibleUntil, entry.JobId));
 			}
 
 			return Task.CompletedTask;
@@ -112,7 +104,7 @@ public Task<Guid> Schedule(object payload, DateTime when)
 					Attempt = 0,
 				};
 				_jobs[guid] = job;
-				_queue.Add((job.ScheduledFor, guid));
+				_queue.Add((job.InvisibleUntil, guid));
 
 				return Task.FromResult(job.JobId);
 			}

src/K4os.Xpovoc.Quarterback/K4os.Xpovoc.Quarterback.csproj

@@ -7,5 +7,6 @@
   <ItemGroup>
     <ProjectReference Include="..\K4os.Xpovoc.Abstractions\K4os.Xpovoc.Abstractions.csproj" />
   </ItemGroup>
+  <Import Project="..\..\Common.targets" />
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/Playground/Program.cs

@@ -195,7 +195,7 @@ private static async Task Producer(CancellationToken token, IJobScheduler schedu
 
 		private static void ConsumeOne(object payload)
 		{
-			Thread.Sleep(1000);
+			// Thread.Sleep(1000);
 			var guid = (Guid) payload;
 			var result = Guids.TryAdd(guid, null);
 			if (!result)