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

Merge pull request #10993 from yuzeming/patch-1

Browse Source 
integration: fix a data race about `err`
This commit is contained in:
Jingyi Hu 2019-08-06 15:58:21 -07:00 committed by GitHub
commit 0d85aa1b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clientv3/integration/metrics_test.go
View File

@ -41,12 +41,13 @@ func TestV3ClientMetrics(t *testing.T) {
var ( var (
addr = "localhost:27989" addr = "localhost:27989"
ln net.Listener ln net.Listener
err error
) )
// listen for all Prometheus metrics // listen for all Prometheus metrics
donec := make(chan struct{}) donec := make(chan struct{})
go func() { go func() {
var err error
defer close(donec) defer close(donec)
srv := &http.Server{Handler: promhttp.Handler()} srv := &http.Server{Handler: promhttp.Handler()}
@ -87,7 +88,7 @@ func TestV3ClientMetrics(t *testing.T) {
pBefore := sumCountersForMetricAndLabels(t, url, "grpc_client_started_total", "Put", "unary") pBefore := sumCountersForMetricAndLabels(t, url, "grpc_client_started_total", "Put", "unary")
_, err = cli.Put(context.Background(), "foo", "bar") _, err := cli.Put(context.Background(), "foo", "bar")
if err != nil { if err != nil {
t.Errorf("Error putting value in key store") t.Errorf("Error putting value in key store")
} }