renamed class and wired up the retry operation to the cache write with 6 retries and 31.5 seconds total timeout. Switched exception handling to catch AggregateException now since that is what is thrown in cache write timeout.

Author: Simon Ejsing

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -114,7 +114,7 @@
     <Compile Include="GitVersionContextTests.cs" />
     <Compile Include="Helpers\DirectoryHelper.cs" />
     <Compile Include="Mocks\MockThreadSleep.cs" />
-    <Compile Include="RetryOperationExponentialBackoffTests.cs" />
+    <Compile Include="OperationWithExponentialBackoffTests.cs" />
     <Compile Include="Init\InitScenarios.cs" />
     <Compile Include="Init\InitStepsDefaultResponsesDoNotThrow.cs" />
     <Compile Include="Init\TestConsole.cs" />

src/GitVersionCore.Tests/RetryOperationExponentialBackoffTests.cs renamed to src/GitVersionCore.Tests/OperationWithExponentialBackoffTests.cs

@@ -5,19 +5,19 @@
 using Shouldly;
 
 [TestFixture]
-public class RetryOperationExponentialBackoffTests
+public class OperationWithExponentialBackoffTests
 {
     [Test]
     public void RetryOperationThrowsWhenNegativeMaxRetries()
     {
-        Action action = () => new RetryOperationExponentialBackoff<IOException>(new MockThreadSleep(), () => { }, -1);
+        Action action = () => new OperationWithExponentialBackoff<IOException>(new MockThreadSleep(), () => { }, -1);
         action.ShouldThrow<ArgumentOutOfRangeException>();
     }
 
     [Test]
     public void RetryOperationThrowsWhenThreadSleepIsNull()
     {
-        Action action = () => new RetryOperationExponentialBackoff<IOException>(null, () => { });
+        Action action = () => new OperationWithExponentialBackoff<IOException>(null, () => { });
         action.ShouldThrow<ArgumentNullException>();
     }
 
@@ -29,7 +29,7 @@ public void OperationIsNotRetriedOnInvalidException()
             throw new Exception();
         };
 
-        var retryOperation = new RetryOperationExponentialBackoff<IOException>(new MockThreadSleep(), operation);
+        var retryOperation = new OperationWithExponentialBackoff<IOException>(new MockThreadSleep(), operation);
         Action action = () => retryOperation.Execute();
         action.ShouldThrow<Exception>();
     }
@@ -48,7 +48,7 @@ public void OperationIsRetriedOnIOException()
             }
         };
 
-        var retryOperation = new RetryOperationExponentialBackoff<IOException>(new MockThreadSleep(), operation);
+        var retryOperation = new OperationWithExponentialBackoff<IOException>(new MockThreadSleep(), operation);
         retryOperation.Execute();
 
         operationCount.ShouldBe(2);
@@ -66,7 +66,7 @@ public void OperationIsRetriedAMaximumNumberOfTimes()
             throw new IOException();
         };
 
-        var retryOperation = new RetryOperationExponentialBackoff<IOException>(new MockThreadSleep(), operation, numberOfRetries);
+        var retryOperation = new OperationWithExponentialBackoff<IOException>(new MockThreadSleep(), operation, numberOfRetries);
         Action action = () => retryOperation.Execute();
         action.ShouldThrow<AggregateException>();
 
@@ -92,7 +92,7 @@ public void OperationDelayDoublesBetweenRetries()
             expectedSleepMSec *= 2;
         };
 
-        var retryOperation = new RetryOperationExponentialBackoff<IOException>(new MockThreadSleep(validator), operation, numberOfRetries);
+        var retryOperation = new OperationWithExponentialBackoff<IOException>(new MockThreadSleep(validator), operation, numberOfRetries);
         Action action = () => retryOperation.Execute();
         action.ShouldThrow<AggregateException>();
 
@@ -115,7 +115,7 @@ public void TotalSleepTimeForSixRetriesIsAboutThirtySeconds()
             totalSleep += u;
         };
 
-        var retryOperation = new RetryOperationExponentialBackoff<IOException>(new MockThreadSleep(validator), operation, numberOfRetries);
+        var retryOperation = new OperationWithExponentialBackoff<IOException>(new MockThreadSleep(validator), operation, numberOfRetries);
         Action action = () => retryOperation.Execute();
         action.ShouldThrow<AggregateException>();
 

src/GitVersionCore/ExecuteCore.cs

@@ -62,9 +62,9 @@ public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicReposi
                     {
                         gitVersionCache.WriteVariablesToDiskCache(repo, dotGitDirectory, versionVariables);
                     }
-                    catch (IOException e)
+                    catch (AggregateException e)
                     {
-                        Logger.WriteWarning(string.Format("I/O exception during cache write:{0}{1}", Environment.NewLine, e));
+                        Logger.WriteWarning(string.Format("One or more exceptions during cache write:{0}{1}", Environment.NewLine, e));
                     }
                 }
 

src/GitVersionCore/GitVersionCache.cs

@@ -30,17 +30,23 @@ public void WriteVariablesToDiskCache(IRepository repo, string gitDir, VersionVa
                 dictionary = variablesFromCache.ToDictionary(x => x.Key, x => x.Value);
             }
 
-            using (var stream = fileSystem.OpenWrite(cacheFileName))
+            Action writeCacheOperation = () =>
             {
-                using (var sw = new StreamWriter(stream))
+                using (var stream = fileSystem.OpenWrite(cacheFileName))
                 {
-                    using (Logger.IndentLog("Storing version variables to cache file " + cacheFileName))
+                    using (var sw = new StreamWriter(stream))
                     {
-                        var serializer = new Serializer();
-                        serializer.Serialize(sw, dictionary);
+                        using (Logger.IndentLog("Storing version variables to cache file " + cacheFileName))
+                        {
+                            var serializer = new Serializer();
+                            serializer.Serialize(sw, dictionary);
+                        }
                     }
                 }
-            }
+            };
+
+            var retryOperation = new OperationWithExponentialBackoff<IOException>(new ThreadSleep(), writeCacheOperation, maxRetries: 6);
+            retryOperation.Execute();
         }
 
         public VersionVariables LoadVersionVariablesFromDiskCache(IRepository repo, string gitDir)

src/GitVersionCore/GitVersionCore.csproj

@@ -123,7 +123,7 @@
     <Compile Include="Helpers\FileSystem.cs" />
     <Compile Include="Helpers\IFileSystem.cs" />
     <Compile Include="Helpers\IThreadSleep.cs" />
-    <Compile Include="Helpers\RetryOperationExponentialBackoff.cs" />
+    <Compile Include="Helpers\OperationWithExponentialBackoff.cs" />
     <Compile Include="Helpers\ServiceMessageEscapeHelper.cs" />
     <Compile Include="Helpers\ThreadSleep.cs" />
     <Compile Include="IncrementStrategyFinder.cs" />

src/GitVersionCore/Helpers/RetryOperationExponentialBackoff.cs renamed to src/GitVersionCore/Helpers/OperationWithExponentialBackoff.cs

@@ -1,17 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace GitVersion.Helpers
 {
-    internal class RetryOperationExponentialBackoff<T> where T : Exception
+    internal class OperationWithExponentialBackoff<T> where T : Exception
     {
         private IThreadSleep ThreadSleep;
         private Action Operation;
         private int MaxRetries;
 
-        public RetryOperationExponentialBackoff(IThreadSleep threadSleep, Action operation, int maxRetries = 5)
+        public OperationWithExponentialBackoff(IThreadSleep threadSleep, Action operation, int maxRetries = 5)
         {
             if (threadSleep == null)
                 throw new ArgumentNullException("threadSleep");