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 #4335 from xiang90/ts

Browse Source 
clientv3: threadsafe
This commit is contained in:
Xiang Li 2016-01-28 17:04:43 -08:00
commit 127d717c0a
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clientv3/kv.go
View File

@ -15,6 +15,8 @@
package clientv3 package clientv3
import ( import (
"sync"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/coreos/etcd/Godeps/_workspace/src/google.golang.org/grpc" "github.com/coreos/etcd/Godeps/_workspace/src/google.golang.org/grpc"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
@ -60,10 +62,11 @@ type KV interface {
} }
type kv struct { type kv struct {
c *Client
mu sync.Mutex // guards all fields
conn *grpc.ClientConn // conn in-use conn *grpc.ClientConn // conn in-use
remote pb.KVClient remote pb.KVClient
c *Client
} }
func NewKV(c *Client) KV { func NewKV(c *Client) KV {
@ -121,7 +124,7 @@ func (kv *kv) Delete(key string) (*DeleteResponse, error) {
func (kv *kv) Compact(rev int64) error { func (kv *kv) Compact(rev int64) error {
for { for {
r := &pb.CompactionRequest{Revision: rev} r := &pb.CompactionRequest{Revision: rev}
_, err := kv.remote.Compact(context.TODO(), r) _, err := kv.getRemote().Compact(context.TODO(), r)
if err == nil { if err == nil {
return nil return nil
} }
@ -155,7 +158,7 @@ func (kv *kv) do(op Op) (*pb.ResponseUnion, error) {
r.SortTarget = pb.RangeRequest_SortTarget(op.sort.Target) r.SortTarget = pb.RangeRequest_SortTarget(op.sort.Target)
} }
resp, err = kv.remote.Range(context.TODO(), r) resp, err = kv.getRemote().Range(context.TODO(), r)
if err == nil { if err == nil {
respu := &pb.ResponseUnion_ResponseRange{ResponseRange: resp} respu := &pb.ResponseUnion_ResponseRange{ResponseRange: resp}
return &pb.ResponseUnion{Response: respu}, nil return &pb.ResponseUnion{Response: respu}, nil
@ -163,7 +166,7 @@ func (kv *kv) do(op Op) (*pb.ResponseUnion, error) {
case tPut: case tPut:
var resp *pb.PutResponse var resp *pb.PutResponse
r := &pb.PutRequest{Key: op.key, Value: op.val, Lease: int64(op.leaseID)} r := &pb.PutRequest{Key: op.key, Value: op.val, Lease: int64(op.leaseID)}
resp, err = kv.remote.Put(context.TODO(), r) resp, err = kv.getRemote().Put(context.TODO(), r)
if err == nil { if err == nil {
respu := &pb.ResponseUnion_ResponsePut{ResponsePut: resp} respu := &pb.ResponseUnion_ResponsePut{ResponsePut: resp}
return &pb.ResponseUnion{Response: respu}, nil return &pb.ResponseUnion{Response: respu}, nil
@ -171,7 +174,7 @@ func (kv *kv) do(op Op) (*pb.ResponseUnion, error) {
case tDeleteRange: case tDeleteRange:
var resp *pb.DeleteRangeResponse var resp *pb.DeleteRangeResponse
r := &pb.DeleteRangeRequest{Key: op.key, RangeEnd: op.end} r := &pb.DeleteRangeRequest{Key: op.key, RangeEnd: op.end}
resp, err = kv.remote.DeleteRange(context.TODO(), r) resp, err = kv.getRemote().DeleteRange(context.TODO(), r)
if err == nil { if err == nil {
respu := &pb.ResponseUnion_ResponseDeleteRange{ResponseDeleteRange: resp} respu := &pb.ResponseUnion_ResponseDeleteRange{ResponseDeleteRange: resp}
return &pb.ResponseUnion{Response: respu}, nil return &pb.ResponseUnion{Response: respu}, nil
@ -195,7 +198,17 @@ func (kv *kv) switchRemote(prevErr error) error {
if err != nil { if err != nil {
return err return err
} }
kv.mu.Lock()
defer kv.mu.Unlock()
kv.conn = newConn kv.conn = newConn
kv.remote = pb.NewKVClient(kv.conn) kv.remote = pb.NewKVClient(kv.conn)
return nil return nil
} }
func (kv *kv) getRemote() pb.KVClient {
kv.mu.Lock()
defer kv.mu.Unlock()
return kv.remote
}

19
clientv3/txn.go
View File

@ -124,21 +124,24 @@ func (txn *txn) Else(ops ...Op) Txn {
} }
func (txn *txn) Commit() (*TxnResponse, error) { func (txn *txn) Commit() (*TxnResponse, error) {
txn.mu.Lock()
defer txn.mu.Unlock()
kv := txn.kv kv := txn.kv
for { for {
r := &pb.TxnRequest{Compare: txn.cmps, Success: txn.sus, Failure: txn.fas} r := &pb.TxnRequest{Compare: txn.cmps, Success: txn.sus, Failure: txn.fas}
resp, err := kv.remote.Txn(context.TODO(), r) resp, err := kv.getRemote().Txn(context.TODO(), r)
if err == nil { if err == nil {
return (*TxnResponse)(resp), nil return (*TxnResponse)(resp), nil
} }
// TODO: this can cause data race with other kv operation. if isRPCError(err) {
newConn, cerr := kv.c.retryConnection(kv.conn, err) return nil, err
if cerr != nil { }
// TODO: return client lib defined connection error
return nil, cerr if nerr := kv.switchRemote(err); nerr != nil {
return nil, nerr
} }
kv.conn = newConn
kv.remote = pb.NewKVClient(kv.conn)
} }
} }