Skip to content

Fix issues that lead to problems with unmounting a repository #157

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

Merged
jamill merged 2 commits into from
Aug 15, 2018
Merged

Fix issues that lead to problems with unmounting a repository #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c09ed4
Shutdown GitStatusCache before components it depends on
jamill Aug 13, 2018
dfbe657
GVFSLock.Shared: correctly report whether lock was acquired
jamill Aug 14, 2018
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
7 changes: 4 additions & 3 deletions GVFS/GVFS.Common/GVFSLock.Shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,14 @@ public static bool TryAcquireGVFSLockForProcess(
}
};

bool isSuccessfulLockResult;
if (unattended)
{
waitForLock();
isSuccessfulLockResult = waitForLock();
}
else
{
ConsoleHelper.ShowStatusWhileRunning(
isSuccessfulLockResult = ConsoleHelper.ShowStatusWhileRunning(
waitForLock,
message,
output: Console.Out,
Expand All @@ -96,7 +97,7 @@ public static bool TryAcquireGVFSLockForProcess(
}

result = null;
return true;
return isSuccessfulLockResult;
Copy link
Copy Markdown
Contributor

@sanoursa sanoursa Aug 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the investigations. Yea this is a pretty glaring hole. We should definitely follow up to find out why we didn't have a reliably failing test as a result of this bug.

Copy link
Copy Markdown
Contributor

@sanoursa sanoursa Aug 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reading through this, and it's not as bad as it seems - which also explains the lack of test failures. In the normal case, this method blocks until the lock is acquired, so the return value is always true. However, that assumption fails once an unmount is initiated, in which case we have to pass through the false result. Constructing a reliable test for that will be tricky, since it's so timing dependent. Your fix does make sense, and assuming that the git status cache stops misbehaving during unmount, that is a pretty good validation of this fix too.

}

public static void ReleaseGVFSLock(
Expand Down
5 changes: 4 additions & 1 deletion GVFS/GVFS.Virtualization/FileSystemCallbacks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,11 @@ public void Stop()
this.postFetchJobThread?.Abort();
}

this.fileSystemVirtualizer.PrepareToStop();
// Shutdown the GitStatusCache before other
// components that it depends on.
this.gitStatusCache.Shutdown();

this.fileSystemVirtualizer.PrepareToStop();
this.backgroundFileSystemTaskRunner.Shutdown();
this.GitIndexProjection.Shutdown();
this.BlobSizes.Shutdown();
Expand Down