mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
3ce31acda4
Printing the values in ctx.String() will data race if the value is mutable and doesn't implement String(), which seems to be common. Instead, just return a fixed string instead of computing it; v3client watches don't need as much flexibility for creating separate strings, so separate ctx strings probably aren't necessary at this point. Fixes #7811
68 lines
2.4 KiB
Go
68 lines
2.4 KiB
Go
// Copyright 2017 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package v3client
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/coreos/etcd/clientv3"
|
|
"github.com/coreos/etcd/etcdserver"
|
|
"github.com/coreos/etcd/etcdserver/api/v3rpc"
|
|
"github.com/coreos/etcd/proxy/grpcproxy/adapter"
|
|
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// New creates a clientv3 client that wraps an in-process EtcdServer. Instead
|
|
// of making gRPC calls through sockets, the client makes direct function calls
|
|
// to the etcd server through its api/v3rpc function interfaces.
|
|
func New(s *etcdserver.EtcdServer) *clientv3.Client {
|
|
c := clientv3.NewCtxClient(context.Background())
|
|
|
|
kvc := adapter.KvServerToKvClient(v3rpc.NewQuotaKVServer(s))
|
|
c.KV = clientv3.NewKVFromKVClient(kvc)
|
|
|
|
lc := adapter.LeaseServerToLeaseClient(v3rpc.NewQuotaLeaseServer(s))
|
|
c.Lease = clientv3.NewLeaseFromLeaseClient(lc, time.Second)
|
|
|
|
wc := adapter.WatchServerToWatchClient(v3rpc.NewWatchServer(s))
|
|
c.Watcher = &watchWrapper{clientv3.NewWatchFromWatchClient(wc)}
|
|
|
|
mc := adapter.MaintenanceServerToMaintenanceClient(v3rpc.NewMaintenanceServer(s))
|
|
c.Maintenance = clientv3.NewMaintenanceFromMaintenanceClient(mc)
|
|
|
|
clc := adapter.ClusterServerToClusterClient(v3rpc.NewClusterServer(s))
|
|
c.Cluster = clientv3.NewClusterFromClusterClient(clc)
|
|
|
|
// TODO: implement clientv3.Auth interface?
|
|
|
|
return c
|
|
}
|
|
|
|
// BlankContext implements Stringer on a context so the ctx string doesn't
|
|
// depend on the context's WithValue data, which tends to be unsynchronized
|
|
// (e.g., x/net/trace), causing ctx.String() to throw data races.
|
|
type blankContext struct{ context.Context }
|
|
|
|
func (*blankContext) String() string { return "(blankCtx)" }
|
|
|
|
// watchWrapper wraps clientv3 watch calls to blank out the context
|
|
// to avoid races on trace data.
|
|
type watchWrapper struct{ clientv3.Watcher }
|
|
|
|
func (ww *watchWrapper) Watch(ctx context.Context, key string, opts ...clientv3.OpOption) clientv3.WatchChan {
|
|
return ww.Watcher.Watch(&blankContext{ctx}, key, opts...)
|
|
}
|