Merge pull request #1856 from NuGet/jeffhand/commandtimeout

Set the command timeout to 5 seconds when recording package statistics
NuGet · Jan 30, 2014 · c2ff710 · c2ff710
2 parents 77acab0 + 0428afe
commit c2ff710
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/NuGetGallery.Core/Entities/EntitiesContext.cs b/src/NuGetGallery.Core/Entities/EntitiesContext.cs
@@ -59,6 +59,11 @@ public void DeleteOnCommit<T>(T entity) where T : class
             Set<T>().Remove(entity);
         }
 
+        public void SetCommandTimeout(int? seconds)
+        {
+            ((IObjectContextAdapter)this).ObjectContext.CommandTimeout = seconds;
+        }
+
 #pragma warning disable 618 // TODO: remove Package.Authors completely once prodution services definitely no longer need it
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
@@ -207,5 +212,6 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                 .HasRequired(cp => cp.PackageRegistration);
         }
 #pragma warning restore 618
+
     }
 }
diff --git a/src/NuGetGallery.Core/Entities/IEntitiesContext.cs b/src/NuGetGallery.Core/Entities/IEntitiesContext.cs
@@ -13,5 +13,6 @@ public interface IEntitiesContext
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Set", Justification="This is to match the EF terminology.")]
         IDbSet<T> Set<T>() where T : class;
         void DeleteOnCommit<T>(T entity) where T : class;
+        void SetCommandTimeout(int? seconds);
     }
 }
diff --git a/src/NuGetGallery/Controllers/ApiController.cs b/src/NuGetGallery/Controllers/ApiController.cs
@@ -110,16 +110,18 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)
                 {
                     var stats = new PackageStatistics
                     {
-                        // IMPORTANT: Timestamp is managed by the database.
                         IPAddress = Request.UserHostAddress,
                         UserAgent = Request.UserAgent,
                         Package = package,
                         Operation = Request.Headers["NuGet-Operation"],
                         DependentPackage = Request.Headers["NuGet-DependentPackage"],
                         ProjectGuids = Request.Headers["NuGet-ProjectGuids"],
                     };
-                   //Temporarily disable stats.
-                   // PackageService.AddDownloadStatistics(stats);
+
+                    // Only allow this to take up to 5 seconds.  Any longer and we just lose the data; oh well.
+                    EntitiesContext.SetCommandTimeout(5);
+
+                    PackageService.AddDownloadStatistics(stats);
                 }
                 catch (ReadOnlyModeException)
                 {

diff --git a/tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs b/tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs
@@ -108,6 +108,12 @@ public void VerifyCommitChanges()
         {
             Assert.True(areChangesSaved, "SaveChanges() has not been called on the entity context.");
         }
+
+
+        public void SetCommandTimeout(int? seconds)
+        {
+            throw new NotSupportedException();
+        }
     }
 }