Merge pull request #932 from jeschu1/turnoffverify2

[releases/shipped] Turn off Commit Graph Verify

Author: jeschu1

GVFS/GVFS.Common/Maintenance/PostFetchStep.cs

@@ -48,12 +48,15 @@ protected override void PerformMaintenance()
 
                 this.RunGitCommand((process) => process.WriteCommitGraph(this.Context.Enlistment.GitObjectsRoot, this.packIndexes), nameof(GitProcess.WriteCommitGraph));
 
+                // Turning off Verify for commit graph due to performance issues.
+                /*
                 GitProcess.Result verifyResult = this.RunGitCommand((process) => process.VerifyCommitGraph(this.Context.Enlistment.GitObjectsRoot), nameof(GitProcess.VerifyCommitGraph));
 
                 if (verifyResult.ExitCodeIsFailure)
                 {
                     this.LogErrorAndRewriteCommitGraph(activity, this.packIndexes);
                 }
+                */
             }
         }
     }

GVFS/GVFS.UnitTests/Maintenance/PostFetchStepTests.cs

@@ -73,12 +73,15 @@ public void WriteMultiPackIndexAndGraphWithPacks()
             this.tracer.StartActivityTracer.RelatedWarningEvents.Count.ShouldEqual(0);
             this.tracer.RelatedInfoEvents.Count.ShouldEqual(0);
 
-            List<string> commands = this.gitProcess.CommandsRun;
-            commands.Count.ShouldEqual(4);
+            List<string> commands = this.gitProcess.CommandsRun;
+
+            // Turning off Commit Graph Verify while we address performance issues
+            // commands.Count.ShouldEqual(4);
+            commands.Count.ShouldEqual(3);
             commands[0].ShouldEqual(this.MultiPackIndexWriteCommand);
             commands[1].ShouldEqual(this.MultiPackIndexVerifyCommand);
             commands[2].ShouldEqual(this.CommitGraphWriteCommand);
-            commands[3].ShouldEqual(this.CommitGraphVerifyCommand);
+            //// commands[3].ShouldEqual(this.CommitGraphVerifyCommand);
         }
 
         [TestCase]
@@ -106,15 +109,19 @@ public void RewriteMultiPackIndexOnBadVerify()
             this.tracer.StartActivityTracer.RelatedWarningEvents.Count.ShouldEqual(0);
 
             List<string> commands = this.gitProcess.CommandsRun;
-            commands.Count.ShouldEqual(5);
+
+            // Turning off Commit Graph Verify, while we address performance issues
+            // commands.Count.ShouldEqual(5);
+            commands.Count.ShouldEqual(4);
             commands[0].ShouldEqual(this.MultiPackIndexWriteCommand);
             commands[1].ShouldEqual(this.MultiPackIndexVerifyCommand);
             commands[2].ShouldEqual(this.MultiPackIndexWriteCommand);
             commands[3].ShouldEqual(this.CommitGraphWriteCommand);
-            commands[4].ShouldEqual(this.CommitGraphVerifyCommand);
+            //// commands[4].ShouldEqual(this.CommitGraphVerifyCommand);
         }
 
         [TestCase]
+        [Ignore("Turn off Commit Graph Verify, while we address performance issues")]
         public void RewriteCommitGraphOnBadVerify()
         {
             this.TestSetup();