mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-12-01 17:44:30 +00:00
Update etcd godep to fix golang 1.5.1 data race
This commit is contained in:
5
Godeps/_workspace/src/github.com/coreos/etcd/client/client.go
generated
vendored
5
Godeps/_workspace/src/github.com/coreos/etcd/client/client.go
generated
vendored
@@ -378,9 +378,12 @@ func (c *simpleHTTPClient) Do(ctx context.Context, act httpAction) (*http.Respon
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
hctx, hcancel := context.WithCancel(ctx)
|
||||
var hctx context.Context
|
||||
var hcancel context.CancelFunc
|
||||
if c.headerTimeout > 0 {
|
||||
hctx, hcancel = context.WithTimeout(ctx, c.headerTimeout)
|
||||
} else {
|
||||
hctx, hcancel = context.WithCancel(ctx)
|
||||
}
|
||||
defer hcancel()
|
||||
|
||||
|
||||
5
Godeps/_workspace/src/github.com/coreos/etcd/store/watcher_hub.go
generated
vendored
5
Godeps/_workspace/src/github.com/coreos/etcd/store/watcher_hub.go
generated
vendored
@@ -78,8 +78,9 @@ func (wh *watcherHub) watch(key string, recursive, stream bool, index, storeInde
|
||||
defer wh.mutex.Unlock()
|
||||
// If the event exists in the known history, append the EtcdIndex and return immediately
|
||||
if event != nil {
|
||||
event.EtcdIndex = storeIndex
|
||||
w.eventChan <- event
|
||||
ne := event.Clone()
|
||||
ne.EtcdIndex = storeIndex
|
||||
w.eventChan <- ne
|
||||
return w, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user