Merge pull request #453 from smola/race

mcuadros · web-flow · commit ce6f5b7c82fc · 2017-06-27T10:14:27.000-07:00
fix race on packfile writer, fixes #351
diff --git a/storage/filesystem/internal/dotgit/writers.go b/storage/filesystem/internal/dotgit/writers.go
@@ -236,7 +236,7 @@ func (s *syncedReader) Seek(offset int64, whence int) (int64, error) {
 	}
 
 	p, err := s.r.Seek(offset, whence)
-	s.read = uint64(p)
+	atomic.StoreUint64(&s.read, uint64(p))
 
 	return p, err
 }

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ func (s *syncedReader) Seek(offset int64, whence int) (int64, error) {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`p, err := s.r.Seek(offset, whence)`
`239`		`- s.read = uint64(p)`
	`239`	`+ atomic.StoreUint64(&s.read, uint64(p))`
`240`	`240`
`241`	`241`	`return p, err`
`242`	`242`	`}`