Allow configuration of retry count

rasmus · rasmus · commit 80dc4a218b32 · 2017-07-10T08:19:05.000+02:00
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -10,6 +10,8 @@
   subject to change
 * New: Now possible to configure retry delay for MSSQL error `40501` (server
   too busy) using `IMsSqlConfiguration.SetServerBusyRetryDelay(RetryDelay)`
+* New: Now possible to configure the retry count of transient exceptions for
+  MSSQL and SQLite using the `ISqlConfiguration.SetTransientRetryCount(int)` 
 * Fixed: Added MSSQL error codes `10928`, `10929`, `18401` and `40540` as well
   as a few native `Win32Exception` exceptions to the list treated as transient
   errors, i.e., EventFlow will automatically retry if the server returns one
diff --git a/Source/EventFlow.MsSql/RetryStrategies/MsSqlErrorRetryStrategy.cs b/Source/EventFlow.MsSql/RetryStrategies/MsSqlErrorRetryStrategy.cs
@@ -52,7 +52,7 @@ public virtual Retry ShouldThisBeRetried(
             // List of possible errors inspired by Azure SqlDatabaseTransientErrorDetectionStrategy
 
             var sqlException = exception as SqlException;
-            if (sqlException == null || currentRetryCount > 2)
+            if (sqlException == null || currentRetryCount > _msSqlConfiguration.TransientRetryCount)
             {
                 return Retry.No;
             }
diff --git a/Source/EventFlow.SQLite/RetryStrategies/SQLiteErrorRetryStrategy.cs b/Source/EventFlow.SQLite/RetryStrategies/SQLiteErrorRetryStrategy.cs
@@ -41,7 +41,7 @@ public SQLiteErrorRetryStrategy(
         public Retry ShouldThisBeRetried(Exception exception, TimeSpan totalExecutionTime, int currentRetryCount)
         {
             var sqLiteException = exception as SQLiteException;
-            if (sqLiteException == null || currentRetryCount > 2)
+            if (sqLiteException == null || currentRetryCount > _configuration.TransientRetryCount)
             {
                 return Retry.No;
             }
diff --git a/Source/EventFlow.Sql/Connections/ISqlConfiguration.cs b/Source/EventFlow.Sql/Connections/ISqlConfiguration.cs
@@ -28,9 +28,11 @@ namespace EventFlow.Sql.Connections
     public interface ISqlConfiguration<out T>
         where T : ISqlConfiguration<T>
     {
-        RetryDelay TransientRetryDelay { get; }
         string ConnectionString { get; }
+        RetryDelay TransientRetryDelay { get; }
+        int TransientRetryCount { get; }
 
         T SetTransientRetryDelay(RetryDelay retryDelay);
+        T SetTransientRetryCount(int retryCount);
     }
 }
diff --git a/Source/EventFlow.Sql/Connections/SqlConfiguration.cs b/Source/EventFlow.Sql/Connections/SqlConfiguration.cs
@@ -35,6 +35,8 @@ public abstract class SqlConfiguration<T> : ISqlConfiguration<T>
             TimeSpan.FromMilliseconds(50),
             TimeSpan.FromMilliseconds(100));
 
+        public int TransientRetryCount { get; private set; } = 2;
+
         public T SetConnectionString(string connectionString)
         {
             ConnectionString = connectionString;
@@ -50,5 +52,13 @@ public T SetTransientRetryDelay(RetryDelay retryDelay)
             // Are there alternatives to this double cast?
             return (T)(object)this;
         }
+
+        public T SetTransientRetryCount(int retryCount)
+        {
+            TransientRetryCount = retryCount;
+
+            // Are there alternatives to this double cast?
+            return (T)(object)this;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public virtual Retry ShouldThisBeRetried(`
`52`	`52`	`// List of possible errors inspired by Azure SqlDatabaseTransientErrorDetectionStrategy`
`53`	`53`
`54`	`54`	`var sqlException = exception as SqlException;`
`55`		`- if (sqlException == null \|\| currentRetryCount > 2)`
	`55`	`+ if (sqlException == null \|\| currentRetryCount > _msSqlConfiguration.TransientRetryCount)`
`56`	`56`	`{`
`57`	`57`	`return Retry.No;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public SQLiteErrorRetryStrategy(`
`41`	`41`	`public Retry ShouldThisBeRetried(Exception exception, TimeSpan totalExecutionTime, int currentRetryCount)`
`42`	`42`	`{`
`43`	`43`	`var sqLiteException = exception as SQLiteException;`
`44`		`- if (sqLiteException == null \|\| currentRetryCount > 2)`
	`44`	`+ if (sqLiteException == null \|\| currentRetryCount > _configuration.TransientRetryCount)`
`45`	`45`	`{`
`46`	`46`	`return Retry.No;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,11 @@ namespace EventFlow.Sql.Connections`
`28`	`28`	`public interface ISqlConfiguration<out T>`
`29`	`29`	`where T : ISqlConfiguration<T>`
`30`	`30`	`{`
`31`		`- RetryDelay TransientRetryDelay { get; }`
`32`	`31`	`string ConnectionString { get; }`
	`32`	`+ RetryDelay TransientRetryDelay { get; }`
	`33`	`+ int TransientRetryCount { get; }`
`33`	`34`
`34`	`35`	`T SetTransientRetryDelay(RetryDelay retryDelay);`
	`36`	`+ T SetTransientRetryCount(int retryCount);`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public abstract class SqlConfiguration<T> : ISqlConfiguration<T>`
`35`	`35`	`TimeSpan.FromMilliseconds(50),`
`36`	`36`	`TimeSpan.FromMilliseconds(100));`
`37`	`37`
	`38`	`+ public int TransientRetryCount { get; private set; } = 2;`
	`39`	`+`
`38`	`40`	`public T SetConnectionString(string connectionString)`
`39`	`41`	`{`
`40`	`42`	`ConnectionString = connectionString;`
`@@ -50,5 +52,13 @@ public T SetTransientRetryDelay(RetryDelay retryDelay)`
`50`	`52`	`// Are there alternatives to this double cast?`
`51`	`53`	`return (T)(object)this;`
`52`	`54`	`}`
	`55`	`+`
	`56`	`+ public T SetTransientRetryCount(int retryCount)`
	`57`	`+ {`
	`58`	`+ TransientRetryCount = retryCount;`
	`59`	`+`
	`60`	`+ // Are there alternatives to this double cast?`
	`61`	`+ return (T)(object)this;`
	`62`	`+ }`
`53`	`63`	`}`
`54`	`64`	`}`