Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Verify commit-graph and multi-pack-index after writing #658

Merged
merged 5 commits into from
Jan 3, 2019
Merged

Verify commit-graph and multi-pack-index after writing #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e01fbd
Verify files after writing them
derrickstolee Jan 2, 2019
7942b9e
Verify and rewrite during PostFetchStep
derrickstolee Jan 3, 2019
0772173
Verify and rewrite during PackfileMaintenanceStep
derrickstolee Jan 3, 2019
fcd7ec9
Clean up PackfileMaintenanceStep around verify results
derrickstolee Jan 3, 2019
e698810
Move rewrite methods to GitMaintenanceStep
derrickstolee Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions GVFS/GVFS.Common/Git/GitProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,12 @@ public Result WriteCommitGraph(string objectDir, List<string> packs)
});
}

public Result VerifyCommitGraph(string objectDir)
{
string command = "commit-graph verify --object-dir \"" + objectDir + "\"";
return this.InvokeGitInWorkingDirectoryRoot(command, useReadObjectHook: true);
}

public Result IndexPack(string packfilePath, string idxOutputPath)
{
return this.InvokeGitAgainstDotGitFolder($"index-pack -o \"{idxOutputPath}\" \"{packfilePath}\"");
Expand All @@ -428,6 +434,11 @@ public Result WriteMultiPackIndex(string objectDir)
return this.InvokeGitAgainstDotGitFolder("-c core.multiPackIndex=true multi-pack-index write --object-dir=\"" + objectDir + "\"");
}

public Result VerifyMultiPackIndex(string objectDir)
{
return this.InvokeGitAgainstDotGitFolder("-c core.multiPackIndex=true multi-pack-index verify --object-dir=\"" + objectDir + "\"");
}

public Result RemoteAdd(string remoteName, string url)
{
return this.InvokeGitAgainstDotGitFolder("remote add " + remoteName + " " + url);
Expand Down
28 changes: 28 additions & 0 deletions GVFS/GVFS.Common/Maintenance/GitMaintenanceStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,34 @@ protected IEnumerable<int> RunningGitProcessIds()
{
Process[] allProcesses = Process.GetProcesses();
return allProcesses.Where(x => x.ProcessName.Equals("git", StringComparison.OrdinalIgnoreCase)).Select(x => x.Id);
}

protected void LogErrorAndRewriteMultiPackIndex(ITracer activity, GitProcess.Result result)
{
EventMetadata errorMetadata = this.CreateEventMetadata();
errorMetadata["MultiPackIndexVerifyOutput"] = result.Output;
errorMetadata["MultiPackIndexVerifyErrors"] = result.Errors;
string multiPackIndexPath = Path.Combine(this.Context.Enlistment.GitPackRoot, "multi-pack-index");
errorMetadata["TryDeleteFileResult"] = this.Context.FileSystem.TryDeleteFile(multiPackIndexPath);

GitProcess.Result rewriteResult = this.RunGitCommand((process) => process.WriteMultiPackIndex(this.Context.Enlistment.GitObjectsRoot));
errorMetadata["RewriteResultExitCode"] = rewriteResult.ExitCode;

activity.RelatedError(errorMetadata, "multi-pack-index is corrupt after write. Deleting and rewriting.");
}

protected void LogErrorAndRewriteCommitGraph(ITracer activity, GitProcess.Result result, List<string> packs)
{
EventMetadata errorMetadata = this.CreateEventMetadata();
errorMetadata["CommitGraphVerifyOutput"] = result.Output;
errorMetadata["CommitGraphVerifyErrors"] = result.Errors;
string commitGraphPath = Path.Combine(this.Context.Enlistment.GitObjectsRoot, "info", "commit-graph");
errorMetadata["TryDeleteFileResult"] = this.Context.FileSystem.TryDeleteFile(commitGraphPath);

GitProcess.Result rewriteResult = this.RunGitCommand((process) => process.WriteCommitGraph(this.Context.Enlistment.GitObjectsRoot, packs));
errorMetadata["RewriteResultExitCode"] = rewriteResult.ExitCode;

activity.RelatedError(errorMetadata, "commit-graph is corrupt after write. Deleting and rewriting.");
}

private void CreateProcessAndRun()
Expand Down
19 changes: 17 additions & 2 deletions GVFS/GVFS.Common/Maintenance/PackfileMaintenanceStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,22 @@ protected override void PerformMaintenance()

GitProcess.Result expireResult = this.RunGitCommand((process) => process.MultiPackIndexExpire(this.Context.Enlistment.GitObjectsRoot));
List<string> staleIdxFiles = this.CleanStaleIdxFiles(out int numDeletionBlocked);
this.GetPackFilesInfo(out int expireCount, out long expireSize, out hasKeep);
this.GetPackFilesInfo(out int expireCount, out long expireSize, out hasKeep);

GitProcess.Result verifyAfterExpire = this.RunGitCommand((process) => process.VerifyMultiPackIndex(this.Context.Enlistment.GitObjectsRoot));
if (verifyAfterExpire.ExitCodeIsFailure)
{
this.LogErrorAndRewriteMultiPackIndex(activity, verifyAfterExpire);
}

GitProcess.Result repackResult = this.RunGitCommand((process) => process.MultiPackIndexRepack(this.Context.Enlistment.GitObjectsRoot, this.batchSize));
this.GetPackFilesInfo(out int afterCount, out long afterSize, out hasKeep);
this.GetPackFilesInfo(out int afterCount, out long afterSize, out hasKeep);

GitProcess.Result verifyAfterRepack = this.RunGitCommand((process) => process.VerifyMultiPackIndex(this.Context.Enlistment.GitObjectsRoot));
if (verifyAfterRepack.ExitCodeIsFailure)
{
derrickstolee marked this conversation as resolved.
Show resolved Hide resolved
this.LogErrorAndRewriteMultiPackIndex(activity, verifyAfterRepack);
}

EventMetadata metadata = new EventMetadata();
metadata.Add("GitObjectsRoot", this.Context.Enlistment.GitObjectsRoot);
Expand All @@ -154,8 +167,10 @@ protected override void PerformMaintenance()
metadata.Add(nameof(afterSize), afterSize);
metadata.Add("ExpireOutput", expireResult.Output);
metadata.Add("ExpireErrors", expireResult.Errors);
metadata.Add("VerifyAfterExpireExitCode", verifyAfterExpire.ExitCode);
metadata.Add("RepackOutput", repackResult.Output);
metadata.Add("RepackErrors", repackResult.Errors);
metadata.Add("VerifyAfterRepackExitCode", verifyAfterRepack.ExitCode);
metadata.Add("NumStaleIdxFiles", staleIdxFiles.Count);
metadata.Add("NumIdxDeletionsBlocked", numDeletionBlocked);
activity.RelatedEvent(EventLevel.Informational, $"{this.Area}_{nameof(this.PerformMaintenance)}", metadata, Keywords.Telemetry);
Expand Down
17 changes: 15 additions & 2 deletions GVFS/GVFS.Common/Maintenance/PostFetchStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class PostFetchStep : GitMaintenanceStep
private const string MultiPackIndexLock = "multi-pack-index.lock";
private List<string> packIndexes;

public PostFetchStep(GVFSContext context, List<string> packIndexes)
: base(context, requireObjectCacheLock: true)
public PostFetchStep(GVFSContext context, List<string> packIndexes, bool requireObjectCacheLock = true)
: base(context, requireObjectCacheLock)
{
this.packIndexes = packIndexes;
}
Expand All @@ -27,6 +27,12 @@ protected override void PerformMaintenance()
this.Context.FileSystem.TryDeleteFile(multiPackIndexLockPath);

this.RunGitCommand((process) => process.WriteMultiPackIndex(this.Context.Enlistment.GitObjectsRoot));

GitProcess.Result verifyResult = this.RunGitCommand((process) => process.VerifyMultiPackIndex(this.Context.Enlistment.GitObjectsRoot));
if (verifyResult.ExitCodeIsFailure)
{
this.LogErrorAndRewriteMultiPackIndex(activity, verifyResult);
}
}

if (this.packIndexes == null || this.packIndexes.Count == 0)
Expand All @@ -41,6 +47,13 @@ protected override void PerformMaintenance()
this.Context.FileSystem.TryDeleteFile(commitGraphLockPath);

this.RunGitCommand((process) => process.WriteCommitGraph(this.Context.Enlistment.GitObjectsRoot, this.packIndexes));

GitProcess.Result verifyResult = this.RunGitCommand((process) => process.VerifyCommitGraph(this.Context.Enlistment.GitObjectsRoot));

if (verifyResult.ExitCodeIsFailure)
{
this.LogErrorAndRewriteCommitGraph(activity, verifyResult, this.packIndexes);
}
}
}
}
Expand Down
44 changes: 39 additions & 5 deletions GVFS/GVFS.UnitTests/Maintenance/PackfileMaintenanceStepTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class PackfileMaintenanceStepTests
private GVFSContext context;

private string ExpireCommand => $"multi-pack-index expire --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\"";
private string VerifyCommand => $"-c core.multiPackIndex=true multi-pack-index verify --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\"";
private string WriteCommand => $"-c core.multiPackIndex=true multi-pack-index write --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\"";
private string RepackCommand => $"-c pack.depth=0 -c pack.window=0 multi-pack-index repack --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\" --batch-size=2g";

[TestCase]
Expand All @@ -36,9 +38,11 @@ public void PackfileMaintenanceIgnoreTimeRestriction()
this.tracer.StartActivityTracer.RelatedErrorEvents.Count.ShouldEqual(0);
this.tracer.StartActivityTracer.RelatedWarningEvents.Count.ShouldEqual(0);
List<string> commands = this.gitProcess.CommandsRun;
commands.Count.ShouldEqual(2);
commands.Count.ShouldEqual(4);
commands[0].ShouldEqual(this.ExpireCommand);
commands[1].ShouldEqual(this.RepackCommand);
commands[1].ShouldEqual(this.VerifyCommand);
commands[2].ShouldEqual(this.RepackCommand);
commands[3].ShouldEqual(this.VerifyCommand);
}

[TestCase]
Expand Down Expand Up @@ -66,9 +70,36 @@ public void PackfileMaintenancePassTimeRestriction()
this.tracer.StartActivityTracer.RelatedErrorEvents.Count.ShouldEqual(0);
this.tracer.StartActivityTracer.RelatedWarningEvents.Count.ShouldEqual(0);
List<string> commands = this.gitProcess.CommandsRun;
commands.Count.ShouldEqual(2);
commands.Count.ShouldEqual(4);
commands[0].ShouldEqual(this.ExpireCommand);
commands[1].ShouldEqual(this.RepackCommand);
commands[1].ShouldEqual(this.VerifyCommand);
commands[2].ShouldEqual(this.RepackCommand);
commands[3].ShouldEqual(this.VerifyCommand);
}

[TestCase]
public void PackfileMaintenanceRewriteOnBadVerify()
{
this.TestSetup(DateTime.UtcNow, failOnVerify: true);

this.gitProcess.SetExpectedCommandResult(
this.WriteCommand,
() => new GitProcess.Result(string.Empty, string.Empty, GitProcess.Result.SuccessCode));

PackfileMaintenanceStep step = new PackfileMaintenanceStep(this.context, requireObjectCacheLock: false, forceRun: true);
step.Execute();

this.tracer.StartActivityTracer.RelatedErrorEvents.Count.ShouldEqual(2);
this.tracer.StartActivityTracer.RelatedWarningEvents.Count.ShouldEqual(0);

List<string> commands = this.gitProcess.CommandsRun;
commands.Count.ShouldEqual(6);
commands[0].ShouldEqual(this.ExpireCommand);
commands[1].ShouldEqual(this.VerifyCommand);
commands[2].ShouldEqual(this.WriteCommand);
commands[3].ShouldEqual(this.RepackCommand);
commands[4].ShouldEqual(this.VerifyCommand);
commands[5].ShouldEqual(this.WriteCommand);
}

[TestCase]
Expand Down Expand Up @@ -109,7 +140,7 @@ public void CleanStaleIdxFiles()
.ShouldBeFalse();
}

private void TestSetup(DateTime lastRun)
private void TestSetup(DateTime lastRun, bool failOnVerify = false)
{
string lastRunTime = EpochConverter.ToUnixEpochSeconds(lastRun).ToString();

Expand Down Expand Up @@ -157,6 +188,9 @@ private void TestSetup(DateTime lastRun)
this.gitProcess.SetExpectedCommandResult(
this.ExpireCommand,
() => new GitProcess.Result(string.Empty, string.Empty, GitProcess.Result.SuccessCode));
this.gitProcess.SetExpectedCommandResult(
this.VerifyCommand,
() => new GitProcess.Result(string.Empty, string.Empty, failOnVerify ? GitProcess.Result.GenericFailureCode : GitProcess.Result.SuccessCode));
this.gitProcess.SetExpectedCommandResult(
this.RepackCommand,
() => new GitProcess.Result(string.Empty, string.Empty, GitProcess.Result.SuccessCode));
Expand Down
Loading