Increase statistics database command timeout (#125)

dtivel · web-flow · commit 1b01837ce3fe · 2017-03-30T09:15:51.000-07:00
diff --git a/src/Gallery.CredentialExpiration/Job.cs b/src/Gallery.CredentialExpiration/Job.cs
@@ -20,7 +20,7 @@ namespace Gallery.CredentialExpiration
 {
     public class Job : JobBase
     {
-        private const int DefaultCommandTimeout = 1800; // 30 minutes max
+        private readonly TimeSpan _defaultCommandTimeout = TimeSpan.FromMinutes(30);
 
         private readonly ConcurrentDictionary<string, DateTimeOffset> _contactedUsers = new ConcurrentDictionary<string, DateTimeOffset>();
         private readonly string _cursorFile = "cursor.json";
@@ -65,7 +65,7 @@ public override bool Init(IDictionary<string, string> jobArgsDictionary)
                 var smtpUri = new SmtpUri(new Uri(smtpConnectionString));
                 _smtpClient = CreateSmtpClient(smtpUri);
 
-                _warnDaysBeforeExpiration = JobConfigurationManager.TryGetIntArgument(jobArgsDictionary, MyJobArgumentNames.WarnDaysBeforeExpiration) 
+                _warnDaysBeforeExpiration = JobConfigurationManager.TryGetIntArgument(jobArgsDictionary, MyJobArgumentNames.WarnDaysBeforeExpiration)
                     ?? _warnDaysBeforeExpiration;
 
                 _allowEmailResendAfterDays = JobConfigurationManager.TryGetIntArgument(jobArgsDictionary, MyJobArgumentNames.AllowEmailResendAfterDays)
@@ -113,7 +113,7 @@ public override async Task<bool> Run()
                     expiredCredentials = (await galleryConnection.QueryWithRetryAsync<ExpiredCredentialData>(
                         string.Format(Strings.GetExpiredCredentialsQuery, _warnDaysBeforeExpiration),
                         maxRetries: 3,
-                        commandTimeout: DefaultCommandTimeout)).ToList();
+                        commandTimeout: _defaultCommandTimeout)).ToList();
 
                     _logger.LogInformation("Retrieved {ExpiredCredentials} expired credentials.",
                         expiredCredentials.Count);
@@ -246,7 +246,7 @@ private static string BuildApiKeyExpiryMessage(string description, DateTimeOffse
                 : string.Format(Strings.ApiKeyExpiring, description, (int)expiryInDays);
 
             // \u2022 - Unicode for bullet point.
-            return "\u2022 "+ message + Environment.NewLine;
+            return "\u2022 " + message + Environment.NewLine;
         }
 
         private SmtpClient CreateSmtpClient(SmtpUri smtpUri)
diff --git a/src/Gallery.Maintenance/DeleteExpiredVerificationKeysTask.cs b/src/Gallery.Maintenance/DeleteExpiredVerificationKeysTask.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Linq;
@@ -12,8 +13,8 @@ namespace Gallery.Maintenance
 {
     internal class DeleteExpiredVerificationKeysTask : IMaintenanceTask
     {
-        private const int DefaultCommandTimeoutInSeconds = 300;
-        
+        private readonly TimeSpan _commandTimeout = TimeSpan.FromMinutes(5);
+
         private const string SelectQuery = @"
 SELECT s.[CredentialKey], c.[UserKey], u.[Username], c.[Expires], s.[Subject] as ScopeSubject
 FROM [dbo].[Credentials] c
@@ -34,7 +35,7 @@ public async Task<bool> RunAsync(Job job)
             {
                 expiredKeys = await connection.QueryWithRetryAsync<PackageVerificationKey>(
                     SelectQuery,
-                    commandTimeout: DefaultCommandTimeoutInSeconds,
+                    commandTimeout: _commandTimeout,
                     maxRetries: 3);
             }
 
@@ -58,13 +59,13 @@ public async Task<bool> RunAsync(Job job)
                     {
                         rowCount = await connection.ExecuteAsync(
                             string.Format(DeleteQuery, string.Join(",", credentialKeys)),
-                            transaction, DefaultCommandTimeoutInSeconds);
+                            transaction, _commandTimeout);
 
                         transaction.Commit();
                     }
                 }
             }
-            
+
             job.Logger.LogInformation("Deleted {0} expired verification keys and scopes. Expected={1}.", rowCount, expectedRowCount);
 
             return rowCount == expectedRowCount;
diff --git a/src/NuGet.Jobs.Common/Extensions/DapperExtensions.cs b/src/NuGet.Jobs.Common/Extensions/DapperExtensions.cs
@@ -10,16 +10,22 @@ namespace System.Data.SqlClient
 {
     public static class DapperExtensions
     {
-        public static Task<int> ExecuteAsync(this SqlConnection connection, string sql, SqlTransaction transaction = null, int timeout = 30)
+        public static Task<int> ExecuteAsync(this SqlConnection connection, string sql, SqlTransaction transaction = null, TimeSpan? commandTimeout = null)
         {
             SqlCommand cmd = connection.CreateCommand();
             cmd.CommandText = sql;
             cmd.CommandType = CommandType.Text;
-            cmd.CommandTimeout = timeout;
+
+            if (commandTimeout.HasValue)
+            {
+                cmd.CommandTimeout = (int)commandTimeout.Value.TotalSeconds;
+            }
+
             if (transaction != null)
             {
                 cmd.Transaction = transaction;
             }
+
             return cmd.ExecuteNonQueryAsync();
         }
 
@@ -28,7 +34,7 @@ public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(
             string sql,
             object param = null,
             IDbTransaction transaction = null,
-            int? commandTimeout = null,
+            TimeSpan? commandTimeout = null,
             CommandType? commandType = null,
             int maxRetries = 10,
             Action onRetry = null)
@@ -37,7 +43,7 @@ public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(
             {
                 try
                 {
-                    return await connection.QueryAsync<T>(sql, param, transaction, commandTimeout, commandType);
+                    return await connection.QueryAsync<T>(sql, param, transaction, (int?)commandTimeout?.TotalSeconds, commandType);
                 }
                 catch (SqlException ex)
                 {
@@ -68,15 +74,16 @@ public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(
                     }
                 }
             }
+
             throw new Exception("Unknown error! Should have thrown the final timeout!");
         }
-        
+
         public static async Task<T> ExecuteScalarWithRetryAsync<T>(
             this SqlConnection connection,
             string sql,
             object param = null,
             IDbTransaction transaction = null,
-            int? commandTimeout = null,
+            TimeSpan? commandTimeout = null,
             CommandType? commandType = null,
             int maxRetries = 10,
             Action onRetry = null)
@@ -85,7 +92,7 @@ public static async Task<T> ExecuteScalarWithRetryAsync<T>(
             {
                 try
                 {
-                    return await connection.ExecuteScalarAsync<T>(sql, param, transaction, commandTimeout, commandType);
+                    return await connection.ExecuteScalarAsync<T>(sql, param, transaction, (int?)commandTimeout?.TotalSeconds, commandType);
                 }
                 catch (SqlException ex)
                 {
@@ -116,7 +123,8 @@ public static async Task<T> ExecuteScalarWithRetryAsync<T>(
                     }
                 }
             }
+
             throw new Exception("Unknown error! Should have thrown the final timeout!");
         }
     }
-}
+}
diff --git a/src/Stats.AggregateCdnDownloadsInGallery/Job.cs b/src/Stats.AggregateCdnDownloadsInGallery/Job.cs
@@ -96,7 +96,7 @@ await statisticsDatabase.QueryWithRetryAsync<DownloadCountData>(
                             _storedProcedureName,
                             transaction: statisticsDatabaseTransaction,
                             commandType: CommandType.StoredProcedure,
-                            commandTimeout: (int)TimeSpan.FromMinutes(15).TotalSeconds,
+                            commandTimeout: TimeSpan.FromMinutes(15),
                             maxRetries: 3))
                         .ToList();
                 }
@@ -174,7 +174,7 @@ await statisticsDatabase.QueryWithRetryAsync<DownloadCountData>(
                         _logger.LogDebug("Updating destination database Download Counts... ({RecordCount} package registrations to process).", packageRegistrationGroups.Count());
 
                         await destinationDatabase.ExecuteAsync(_updateFromTempTable,
-                            timeout: (int)TimeSpan.FromMinutes(30).TotalSeconds);
+                            commandTimeout: TimeSpan.FromMinutes(30));
 
                         _logger.LogInformation("Updated destination database Download Counts.");
                     }
@@ -199,7 +199,7 @@ private async Task<IDictionary<string, string>> GetPackageRegistrations(SqlConne
             // Ensure results are sorted deterministically.
             var packageRegistrationData = (await sqlConnection.QueryWithRetryAsync<PackageRegistrationData>(
                     "SELECT [Key], LOWER([Id]) AS LowercasedId, [Id] AS OriginalId FROM [dbo].[PackageRegistrations] (NOLOCK) ORDER BY [Id] ASC",
-                    commandTimeout: (int)TimeSpan.FromMinutes(10).TotalSeconds,
+                    commandTimeout: TimeSpan.FromMinutes(10),
                     maxRetries: 5)).ToList();
 
             // We are not using .ToDictionary() and instead explicitly looping through these items to be able to detect
diff --git a/src/Stats.CreateAzureCdnWarehouseReports/DownloadCountReport.cs b/src/Stats.CreateAzureCdnWarehouseReports/DownloadCountReport.cs
@@ -18,7 +18,7 @@ public class DownloadCountReport
         : ReportBase
     {
         private const string _storedProcedureName = "[dbo].[SelectTotalDownloadCountsPerPackageVersion]";
-        private const int _defaultCommandTimeout = 1800; // 30 minutes max
+        private readonly TimeSpan _defaultCommandTimeout = TimeSpan.FromMinutes(30);
         internal const string ReportName = "downloads.v1.json";
 
         public DownloadCountReport(IEnumerable<StorageContainerTarget> targets, SqlConnectionStringBuilder statisticsDatabase, SqlConnectionStringBuilder galleryDatabase)
diff --git a/src/Stats.CreateAzureCdnWarehouseReports/DownloadsPerToolVersionReport.cs b/src/Stats.CreateAzureCdnWarehouseReports/DownloadsPerToolVersionReport.cs
@@ -18,7 +18,7 @@ public class DownloadsPerToolVersionReport
         : ReportBase
     {
         private const string _storedProcedureName = "[dbo].[SelectTotalDownloadCountsPerToolVersion]";
-        private const int _defaultCommandTimeout = 1800; // 30 minutes max
+        private readonly TimeSpan _defaultCommandTimeout = TimeSpan.FromMinutes(30);
         internal const string ReportName = "tools.v1.json";
 
         public DownloadsPerToolVersionReport(CloudStorageAccount cloudStorageAccount, string statisticsContainerName, SqlConnectionStringBuilder statisticsDatabase, SqlConnectionStringBuilder galleryDatabase)
diff --git a/src/Stats.CreateAzureCdnWarehouseReports/GalleryTotalsReport.cs b/src/Stats.CreateAzureCdnWarehouseReports/GalleryTotalsReport.cs
@@ -23,7 +23,7 @@ public class GalleryTotalsReport
         internal const string ReportName = "stats-totals.json";
 
         public GalleryTotalsReport(CloudStorageAccount cloudStorageAccount, string statisticsContainerName, SqlConnectionStringBuilder statisticsDatabase, SqlConnectionStringBuilder galleryDatabase)
-            : base(new [] { new StorageContainerTarget(cloudStorageAccount, statisticsContainerName) }, statisticsDatabase, galleryDatabase)
+            : base(new[] { new StorageContainerTarget(cloudStorageAccount, statisticsContainerName) }, statisticsDatabase, galleryDatabase)
         {
         }
 
@@ -47,7 +47,10 @@ public async Task Run()
             using (var transaction = connection.BeginTransaction(IsolationLevel.Snapshot))
             {
                 totalsData.Downloads = (await connection.ExecuteScalarWithRetryAsync<long>(
-                    WarehouseStoredProcedureName, commandType: CommandType.StoredProcedure, transaction: transaction));
+                    WarehouseStoredProcedureName,
+                    commandType: CommandType.StoredProcedure,
+                    commandTimeout: TimeSpan.FromMinutes(5),
+                    transaction: transaction));
             }
             Trace.TraceInformation("Total downloads: {0}", totalsData.Downloads);
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
	`4`	`+using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`	`using System.Data.SqlClient;`
`6`	`7`	`using System.Linq;`
`@@ -12,8 +13,8 @@ namespace Gallery.Maintenance`
`12`	`13`	`{`
`13`	`14`	`internal class DeleteExpiredVerificationKeysTask : IMaintenanceTask`
`14`	`15`	`{`
`15`		`- private const int DefaultCommandTimeoutInSeconds = 300;`
`16`		`-`
	`16`	`+ private readonly TimeSpan _commandTimeout = TimeSpan.FromMinutes(5);`
	`17`	`+`
`17`	`18`	`private const string SelectQuery = @"`
`18`	`19`	`SELECT s.[CredentialKey], c.[UserKey], u.[Username], c.[Expires], s.[Subject] as ScopeSubject`
`19`	`20`	`FROM [dbo].[Credentials] c`
`@@ -34,7 +35,7 @@ public async Task<bool> RunAsync(Job job)`
`34`	`35`	`{`
`35`	`36`	`expiredKeys = await connection.QueryWithRetryAsync<PackageVerificationKey>(`
`36`	`37`	`SelectQuery,`
`37`		`- commandTimeout: DefaultCommandTimeoutInSeconds,`
	`38`	`+ commandTimeout: _commandTimeout,`
`38`	`39`	`maxRetries: 3);`
`39`	`40`	`}`
`40`	`41`
`@@ -58,13 +59,13 @@ public async Task<bool> RunAsync(Job job)`
`58`	`59`	`{`
`59`	`60`	`rowCount = await connection.ExecuteAsync(`
`60`	`61`	`string.Format(DeleteQuery, string.Join(",", credentialKeys)),`
`61`		`- transaction, DefaultCommandTimeoutInSeconds);`
	`62`	`+ transaction, _commandTimeout);`
`62`	`63`
`63`	`64`	`transaction.Commit();`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`}`
`67`		`-`
	`68`	`+`
`68`	`69`	`job.Logger.LogInformation("Deleted {0} expired verification keys and scopes. Expected={1}.", rowCount, expectedRowCount);`
`69`	`70`
`70`	`71`	`return rowCount == expectedRowCount;`
Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,22 @@ namespace System.Data.SqlClient`
`10`	`10`	`{`
`11`	`11`	`public static class DapperExtensions`
`12`	`12`	`{`
`13`		`- public static Task<int> ExecuteAsync(this SqlConnection connection, string sql, SqlTransaction transaction = null, int timeout = 30)`
	`13`	`+ public static Task<int> ExecuteAsync(this SqlConnection connection, string sql, SqlTransaction transaction = null, TimeSpan? commandTimeout = null)`
`14`	`14`	`{`
`15`	`15`	`SqlCommand cmd = connection.CreateCommand();`
`16`	`16`	`cmd.CommandText = sql;`
`17`	`17`	`cmd.CommandType = CommandType.Text;`
`18`		`- cmd.CommandTimeout = timeout;`
	`18`	`+`
	`19`	`+ if (commandTimeout.HasValue)`
	`20`	`+ {`
	`21`	`+ cmd.CommandTimeout = (int)commandTimeout.Value.TotalSeconds;`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`if (transaction != null)`
`20`	`25`	`{`
`21`	`26`	`cmd.Transaction = transaction;`
`22`	`27`	`}`
	`28`	`+`
`23`	`29`	`return cmd.ExecuteNonQueryAsync();`
`24`	`30`	`}`
`25`	`31`
`@@ -28,7 +34,7 @@ public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(`
`28`	`34`	`string sql,`
`29`	`35`	`object param = null,`
`30`	`36`	`IDbTransaction transaction = null,`
`31`		`- int? commandTimeout = null,`
	`37`	`+ TimeSpan? commandTimeout = null,`
`32`	`38`	`CommandType? commandType = null,`
`33`	`39`	`int maxRetries = 10,`
`34`	`40`	`Action onRetry = null)`
`@@ -37,7 +43,7 @@ public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(`
`37`	`43`	`{`
`38`	`44`	`try`
`39`	`45`	`{`
`40`		`- return await connection.QueryAsync<T>(sql, param, transaction, commandTimeout, commandType);`
	`46`	`+ return await connection.QueryAsync<T>(sql, param, transaction, (int?)commandTimeout?.TotalSeconds, commandType);`
`41`	`47`	`}`
`42`	`48`	`catch (SqlException ex)`
`43`	`49`	`{`
`@@ -68,15 +74,16 @@ public static async Task<IEnumerable<T>> QueryWithRetryAsync<T>(`
`68`	`74`	`}`
`69`	`75`	`}`
`70`	`76`	`}`
	`77`	`+`
`71`	`78`	`throw new Exception("Unknown error! Should have thrown the final timeout!");`
`72`	`79`	`}`
`73`		`-`
	`80`	`+`
`74`	`81`	`public static async Task<T> ExecuteScalarWithRetryAsync<T>(`
`75`	`82`	`this SqlConnection connection,`
`76`	`83`	`string sql,`
`77`	`84`	`object param = null,`
`78`	`85`	`IDbTransaction transaction = null,`
`79`		`- int? commandTimeout = null,`
	`86`	`+ TimeSpan? commandTimeout = null,`
`80`	`87`	`CommandType? commandType = null,`
`81`	`88`	`int maxRetries = 10,`
`82`	`89`	`Action onRetry = null)`
`@@ -85,7 +92,7 @@ public static async Task<T> ExecuteScalarWithRetryAsync<T>(`
`85`	`92`	`{`
`86`	`93`	`try`
`87`	`94`	`{`
`88`		`- return await connection.ExecuteScalarAsync<T>(sql, param, transaction, commandTimeout, commandType);`
	`95`	`+ return await connection.ExecuteScalarAsync<T>(sql, param, transaction, (int?)commandTimeout?.TotalSeconds, commandType);`
`89`	`96`	`}`
`90`	`97`	`catch (SqlException ex)`
`91`	`98`	`{`
`@@ -116,7 +123,8 @@ public static async Task<T> ExecuteScalarWithRetryAsync<T>(`
`116`	`123`	`}`
`117`	`124`	`}`
`118`	`125`	`}`
	`126`	`+`
`119`	`127`	`throw new Exception("Unknown error! Should have thrown the final timeout!");`
`120`	`128`	`}`
`121`	`129`	`}`
`122`		`-}`
	`130`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class DownloadCountReport`
`18`	`18`	`: ReportBase`
`19`	`19`	`{`
`20`	`20`	`private const string _storedProcedureName = "[dbo].[SelectTotalDownloadCountsPerPackageVersion]";`
`21`		`- private const int _defaultCommandTimeout = 1800; // 30 minutes max`
	`21`	`+ private readonly TimeSpan _defaultCommandTimeout = TimeSpan.FromMinutes(30);`
`22`	`22`	`internal const string ReportName = "downloads.v1.json";`
`23`	`23`
`24`	`24`	`public DownloadCountReport(IEnumerable<StorageContainerTarget> targets, SqlConnectionStringBuilder statisticsDatabase, SqlConnectionStringBuilder galleryDatabase)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class GalleryTotalsReport`
`23`	`23`	`internal const string ReportName = "stats-totals.json";`
`24`	`24`
`25`	`25`	`public GalleryTotalsReport(CloudStorageAccount cloudStorageAccount, string statisticsContainerName, SqlConnectionStringBuilder statisticsDatabase, SqlConnectionStringBuilder galleryDatabase)`
`26`		`- : base(new [] { new StorageContainerTarget(cloudStorageAccount, statisticsContainerName) }, statisticsDatabase, galleryDatabase)`
	`26`	`+ : base(new[] { new StorageContainerTarget(cloudStorageAccount, statisticsContainerName) }, statisticsDatabase, galleryDatabase)`
`27`	`27`	`{`
`28`	`28`	`}`
`29`	`29`
`@@ -47,7 +47,10 @@ public async Task Run()`
`47`	`47`	`using (var transaction = connection.BeginTransaction(IsolationLevel.Snapshot))`
`48`	`48`	`{`
`49`	`49`	`totalsData.Downloads = (await connection.ExecuteScalarWithRetryAsync<long>(`
`50`		`- WarehouseStoredProcedureName, commandType: CommandType.StoredProcedure, transaction: transaction));`
	`50`	`+ WarehouseStoredProcedureName,`
	`51`	`+ commandType: CommandType.StoredProcedure,`
	`52`	`+ commandTimeout: TimeSpan.FromMinutes(5),`
	`53`	`+ transaction: transaction));`
`51`	`54`	`}`
`52`	`55`	`Trace.TraceInformation("Total downloads: {0}", totalsData.Downloads);`
`53`	`56`