status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-19 17:14:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2262 from WIZARD-CXY/master

Browse Source 
Fixes go race bug in startup log buffering.
This commit is contained in:
James Phillips 2016-09-20 17:24:52 -07:00 committed by GitHub
commit b0b05f48f3
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
command/agent/gated_writer.go
View File

@ -29,13 +29,26 @@ func (w *GatedWriter) Flush() {
} }
func (w *GatedWriter) Write(p []byte) (n int, err error) { func (w *GatedWriter) Write(p []byte) (n int, err error) {
// Once we flush we no longer synchronize writers since there's
// no use of the internal buffer. This is the happy path.
w.lock.RLock() w.lock.RLock()
defer w.lock.RUnlock() if w.flush {
w.lock.RUnlock()
return w.Writer.Write(p)
}
w.lock.RUnlock()
// Now take the write lock.
w.lock.Lock()
defer w.lock.Unlock()
// Things could have changed between the locking operations, so we
// have to check one more time.
if w.flush { if w.flush {
return w.Writer.Write(p) return w.Writer.Write(p)
} }
// Buffer up the written data.
p2 := make([]byte, len(p)) p2 := make([]byte, len(p))
copy(p2, p) copy(p2, p)
w.buf = append(w.buf, p2) w.buf = append(w.buf, p2)