Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcd: fix data race in transporter

Browse Source
This commit is contained in:
Xiang Li 2014-07-10 20:58:54 -07:00 committed by Yicheng Qin
parent 3f435571d3
commit 284e76f0da
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcd/transporter.go
View File

@ -87,11 +87,11 @@ func (t *transporter) send(addr string, data []byte) error {
t.mu.RUnlock() t.mu.RUnlock()
return fmt.Errorf("transporter stopped") return fmt.Errorf("transporter stopped")
} }
t.wg.Add(1)
defer t.wg.Done()
t.mu.RUnlock() t.mu.RUnlock()
buf := bytes.NewBuffer(data) buf := bytes.NewBuffer(data)
t.wg.Add(1)
defer t.wg.Done()
resp, err := t.client.Post(addr, "application/octet-stream", buf) resp, err := t.client.Post(addr, "application/octet-stream", buf)
if err != nil { if err != nil {
return err return err
@ -148,7 +148,10 @@ func (t *transporter) serveCfg(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
return return
} }
if u, ok := t.urls[id]; ok { t.mu.RLock()
u, ok := t.urls[id]
t.mu.RUnlock()
if ok {
w.Write([]byte(u)) w.Write([]byte(u))
return return
} }