Skip to content

K
k3s
Commit 4a65fa1f authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Merge pull request #18684 from timothysc/etcd-godep-1.5.1

Update etcd godep to fix golang 1.5.1 data race
parents b5387da0 a63ab341
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 51 deletions
Godeps/Godeps.json
View file @ 4a65fa1f
...@@ -122,123 +122,123 @@ ...@@ -122,123 +122,123 @@
}, },
{ {
"ImportPath": "github.com/coreos/etcd/client", "ImportPath": "github.com/coreos/etcd/client",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/discovery", "ImportPath": "github.com/coreos/etcd/discovery",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/error", "ImportPath": "github.com/coreos/etcd/error",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver", "ImportPath": "github.com/coreos/etcd/etcdserver",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/crc", "ImportPath": "github.com/coreos/etcd/pkg/crc",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/fileutil", "ImportPath": "github.com/coreos/etcd/pkg/fileutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/httputil", "ImportPath": "github.com/coreos/etcd/pkg/httputil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/idutil", "ImportPath": "github.com/coreos/etcd/pkg/idutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/ioutil", "ImportPath": "github.com/coreos/etcd/pkg/ioutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/netutil", "ImportPath": "github.com/coreos/etcd/pkg/netutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/pathutil", "ImportPath": "github.com/coreos/etcd/pkg/pathutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/pbutil", "ImportPath": "github.com/coreos/etcd/pkg/pbutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/runtime", "ImportPath": "github.com/coreos/etcd/pkg/runtime",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/timeutil", "ImportPath": "github.com/coreos/etcd/pkg/timeutil",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/transport", "ImportPath": "github.com/coreos/etcd/pkg/transport",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/types", "ImportPath": "github.com/coreos/etcd/pkg/types",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/wait", "ImportPath": "github.com/coreos/etcd/pkg/wait",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/raft", "ImportPath": "github.com/coreos/etcd/raft",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/rafthttp", "ImportPath": "github.com/coreos/etcd/rafthttp",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/snap", "ImportPath": "github.com/coreos/etcd/snap",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/storage", "ImportPath": "github.com/coreos/etcd/storage",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/store", "ImportPath": "github.com/coreos/etcd/store",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/version", "ImportPath": "github.com/coreos/etcd/version",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/wal", "ImportPath": "github.com/coreos/etcd/wal",
"Comment": "v2.2.2-1-g09b81ba", "Comment": "v2.2.2-4-ge0c7768",
"Rev": "09b81bad15e96e05dafd0494a8c165a13718c350" "Rev": "e0c7768f94cdc268b2fce31ada1dea823f11f505"
}, },
{ {
"ImportPath": "github.com/coreos/go-etcd/etcd", "ImportPath": "github.com/coreos/go-etcd/etcd",
......
Godeps/_workspace/src/github.com/coreos/etcd/client/client.go
View file @ 4a65fa1f
...@@ -378,9 +378,12 @@ func (c *simpleHTTPClient) Do(ctx context.Context, act httpAction) (*http.Respon ...@@ -378,9 +378,12 @@ func (c *simpleHTTPClient) Do(ctx context.Context, act httpAction) (*http.Respon
return nil, nil, err return nil, nil, err
} }
hctx, hcancel := context.WithCancel(ctx) var hctx context.Context
var hcancel context.CancelFunc
if c.headerTimeout > 0 { if c.headerTimeout > 0 {
hctx, hcancel = context.WithTimeout(ctx, c.headerTimeout) hctx, hcancel = context.WithTimeout(ctx, c.headerTimeout)
} else {
hctx, hcancel = context.WithCancel(ctx)
} }
defer hcancel() defer hcancel()
......
Godeps/_workspace/src/github.com/coreos/etcd/store/watcher_hub.go
View file @ 4a65fa1f
...@@ -78,8 +78,9 @@ func (wh *watcherHub) watch(key string, recursive, stream bool, index, storeInde ...@@ -78,8 +78,9 @@ func (wh *watcherHub) watch(key string, recursive, stream bool, index, storeInde
defer wh.mutex.Unlock() defer wh.mutex.Unlock()
// If the event exists in the known history, append the EtcdIndex and return immediately // If the event exists in the known history, append the EtcdIndex and return immediately
if event != nil { if event != nil {
event.EtcdIndex = storeIndex ne := event.Clone()
w.eventChan <- event ne.EtcdIndex = storeIndex
w.eventChan <- ne
return w, nil return w, nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment