Fix incorrect pending revalidation count (#6382)

loic-sharma · web-flow · commit c0e6e72b94d1 · 2018-09-05T14:45:12.000-07:00
Fixes #6362 Depends on NuGet/ServerCommon#190
diff --git a/src/NuGetGallery/Areas/Admin/Services/RevalidationAdminService.cs b/src/NuGetGallery/Areas/Admin/Services/RevalidationAdminService.cs
@@ -20,7 +20,7 @@ public RevalidationStatistics GetStatistics()
         {
             var recentCutoff = DateTime.UtcNow.Subtract(TimeSpan.FromHours(1));
 
-            var pending = _revalidations.GetAll().Count(r => !r.Enqueued.HasValue);
+            var pending = _revalidations.GetAll().Count(r => !r.Enqueued.HasValue && !r.Completed);
             var started = _revalidations.GetAll().Count(r => r.Enqueued.HasValue);
             var recent = _revalidations.GetAll().Count(r => r.Enqueued.HasValue && r.Enqueued >= recentCutoff);
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public RevalidationStatistics GetStatistics()`
`20`	`20`	`{`
`21`	`21`	`var recentCutoff = DateTime.UtcNow.Subtract(TimeSpan.FromHours(1));`
`22`	`22`
`23`		`- var pending = _revalidations.GetAll().Count(r => !r.Enqueued.HasValue);`
	`23`	`+ var pending = _revalidations.GetAll().Count(r => !r.Enqueued.HasValue && !r.Completed);`
`24`	`24`	`var started = _revalidations.GetAll().Count(r => r.Enqueued.HasValue);`
`25`	`25`	`var recent = _revalidations.GetAll().Count(r => r.Enqueued.HasValue && r.Enqueued >= recentCutoff);`
`26`	`26`