Skip to content

Ignore Sync errors on pipes when doing CheckAttributeReader.CheckPath, fix the hang of git cat-file #17096

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
merged 8 commits into from
Sep 20, 2021
Merged

Ignore Sync errors on pipes when doing CheckAttributeReader.CheckPath, fix the hang of git cat-file #17096

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae92e3e
Ignore Sync errors on pipes when doing `CheckAttributeReader.CheckPath`
wxiaoguang Sep 19, 2021
22fde43
apply env patch
wxiaoguang Sep 20, 2021
a01ed51
Drop the Sync and fix a number of issues with the Close function
zeripath Sep 20, 2021
ccd123e
add logs for DBIndexer and CheckPath
wxiaoguang Sep 20, 2021
4ae72fb
Fix some more closing bugs
zeripath Sep 20, 2021
d9dd48f
Add test case for language_stats
zeripath Sep 20, 2021
16d7c8b
Update modules/indexer/stats/db.go
wxiaoguang Sep 20, 2021
bb43441
Merge branch 'main' into fix-check-path-sync
6543 Sep 20, 2021
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
12 changes: 6 additions & 6 deletions modules/git/repo_attribute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,15 @@ func (c *CheckAttributeReader) Init(ctx context.Context) error {

if len(c.IndexFile) > 0 && CheckGitVersionAtLeast("1.7.8") == nil {
cmdArgs = append(cmdArgs, "--cached")
c.env = []string{"GIT_INDEX_FILE=" + c.IndexFile}
c.env = append(c.env, "GIT_INDEX_FILE="+c.IndexFile)
}

if len(c.WorkTree) > 0 && CheckGitVersionAtLeast("1.7.8") == nil {
c.env = []string{"GIT_WORK_TREE=" + c.WorkTree}
c.env = append(c.env, "GIT_WORK_TREE="+c.WorkTree)
}

c.env = append(c.env, "GIT_FLUSH=1")

if len(c.Attributes) > 0 {
cmdArgs = append(cmdArgs, c.Attributes...)
cmdArgs = append(cmdArgs, "--")
Expand Down Expand Up @@ -182,10 +184,8 @@ func (c *CheckAttributeReader) CheckPath(path string) (map[string]string, error)
return nil, err
}

if err := c.stdinWriter.Sync(); err != nil {
defer c.cancel()
return nil, err
}
// not necessary to call Sync on pipe. And it usually results in error: "sync |1: invalid argument"
_ = c.stdinWriter.Sync()

rs := make(map[string]string)
for range c.Attributes {
Expand Down