From ec2ac725857da45cdf2bc3e91567d520465a5506 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Fri, 13 May 2016 22:54:48 -0700 Subject: [PATCH] proxy: initial grpc kv service proxy --- clientv3/kv.go | 4 ++ integration/cluster.go | 2 + proxy/grpcproxy/kv.go | 130 +++++++++++++++++++++++++++++++++++++ proxy/grpcproxy/kv_test.go | 95 +++++++++++++++++++++++++++ 4 files changed, 231 insertions(+) create mode 100644 proxy/grpcproxy/kv.go create mode 100644 proxy/grpcproxy/kv_test.go diff --git a/clientv3/kv.go b/clientv3/kv.go index 72fc8d478..1e964de0c 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -73,6 +73,10 @@ type OpResponse struct { del *DeleteResponse } +func (op OpResponse) Put() *PutResponse { return op.put } +func (op OpResponse) Get() *GetResponse { return op.get } +func (op OpResponse) Del() *DeleteResponse { return op.del } + type kv struct { rc *remoteClient remote pb.KVClient diff --git a/integration/cluster.go b/integration/cluster.go index 714b519d7..1d4725abf 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -423,6 +423,8 @@ type member struct { grpcAddr string } +func (m *member) GRPCAddr() string { return m.grpcAddr } + type memberConfig struct { name string peerTLS *transport.TLSInfo diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go new file mode 100644 index 000000000..bea0da736 --- /dev/null +++ b/proxy/grpcproxy/kv.go @@ -0,0 +1,130 @@ +// Copyright 2016 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 grpcproxy + +import ( + "github.com/coreos/etcd/clientv3" + pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + + "golang.org/x/net/context" +) + +type kvProxy struct { + c *clientv3.Client +} + +func NewKvProxy(c *clientv3.Client) *kvProxy { + return &kvProxy{ + c: c, + } +} + +func (p *kvProxy) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeResponse, error) { + resp, err := p.c.Do(ctx, RangeRequestToOp(r)) + return (*pb.RangeResponse)(resp.Get()), err +} + +func (p *kvProxy) Put(ctx context.Context, r *pb.PutRequest) (*pb.PutResponse, error) { + resp, err := p.c.Do(ctx, PutRequestToOp(r)) + return (*pb.PutResponse)(resp.Put()), err +} + +func (p *kvProxy) DeleteRange(ctx context.Context, r *pb.DeleteRangeRequest) (*pb.DeleteRangeResponse, error) { + resp, err := p.c.Do(ctx, DelRequestToOp(r)) + return (*pb.DeleteRangeResponse)(resp.Del()), err +} + +func (p *kvProxy) Txn(ctx context.Context, r *pb.TxnRequest) (*pb.TxnResponse, error) { + txn := p.c.Txn(ctx) + cmps := make([]clientv3.Cmp, len(r.Compare)) + thenops := make([]clientv3.Op, len(r.Success)) + elseops := make([]clientv3.Op, len(r.Failure)) + + for i := range r.Compare { + cmps[i] = (clientv3.Cmp)(*r.Compare[i]) + } + + for i := range r.Success { + thenops[i] = requestUnionToOp(r.Success[i]) + } + + for i := range r.Failure { + elseops[i] = requestUnionToOp(r.Failure[i]) + } + + resp, err := txn.If(cmps...).Then(thenops...).Else(elseops...).Commit() + return (*pb.TxnResponse)(resp), err +} + +func (p *kvProxy) Close() error { + return p.c.Close() +} + +func requestUnionToOp(union *pb.RequestUnion) clientv3.Op { + switch tv := union.Request.(type) { + case *pb.RequestUnion_RequestRange: + if tv.RequestRange != nil { + return RangeRequestToOp(tv.RequestRange) + } + case *pb.RequestUnion_RequestPut: + if tv.RequestPut != nil { + return PutRequestToOp(tv.RequestPut) + } + case *pb.RequestUnion_RequestDeleteRange: + if tv.RequestDeleteRange != nil { + return DelRequestToOp(tv.RequestDeleteRange) + } + } + panic("unknown request") +} + +func RangeRequestToOp(r *pb.RangeRequest) clientv3.Op { + opts := []clientv3.OpOption{} + if len(r.RangeEnd) != 0 { + opts = append(opts, clientv3.WithRange(string(r.RangeEnd))) + } + opts = append(opts, clientv3.WithRev(r.Revision)) + opts = append(opts, clientv3.WithLimit(r.Limit)) + opts = append(opts, clientv3.WithSort( + clientv3.SortTarget(r.SortTarget), + clientv3.SortOrder(r.SortOrder)), + ) + + if r.Serializable { + opts = append(opts, clientv3.WithSerializable()) + } + + return clientv3.OpGet(string(r.Key), opts...) +} + +func PutRequestToOp(r *pb.PutRequest) clientv3.Op { + opts := []clientv3.OpOption{} + opts = append(opts, clientv3.WithLease(clientv3.LeaseID(r.Lease))) + + return clientv3.OpPut(string(r.Key), string(r.Value), opts...) +} + +func DelRequestToOp(r *pb.DeleteRangeRequest) clientv3.Op { + opts := []clientv3.OpOption{} + if len(r.RangeEnd) != 0 { + opts = append(opts, clientv3.WithRange(string(r.RangeEnd))) + } + + return clientv3.OpDelete(string(r.Key), opts...) +} + +func (p *kvProxy) Compact(ctx context.Context, r *pb.CompactionRequest) (*pb.CompactionResponse, error) { + panic("unimplemented") +} diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go new file mode 100644 index 000000000..94b19bb0f --- /dev/null +++ b/proxy/grpcproxy/kv_test.go @@ -0,0 +1,95 @@ +// Copyright 2016 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 grpcproxy + +import ( + "net" + "testing" + "time" + + "github.com/coreos/etcd/clientv3" + pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/integration" + "github.com/coreos/etcd/pkg/testutil" + + "golang.org/x/net/context" + "google.golang.org/grpc" +) + +func TestKVProxyRange(t *testing.T) { + defer testutil.AfterTest(t) + + clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) + defer clus.Terminate(t) + + kvts := newKVProxyServer([]string{clus.Members[0].GRPCAddr()}, t) + defer kvts.close() + + // create a client and try to get key from proxy. + cfg := clientv3.Config{ + Endpoints: []string{kvts.l.Addr().String()}, + DialTimeout: 5 * time.Second, + } + client, err := clientv3.New(cfg) + if err != nil { + t.Fatalf("err = %v, want nil") + } + _, err = client.Get(context.Background(), "foo") + if err != nil { + t.Fatalf("err = %v, want nil") + } +} + +type kvproxyTestServer struct { + kp *kvProxy + server *grpc.Server + l net.Listener +} + +func (kts *kvproxyTestServer) close() { + kts.server.Stop() + kts.l.Close() + kts.kp.Close() +} + +func newKVProxyServer(endpoints []string, t *testing.T) *kvproxyTestServer { + cfg := clientv3.Config{ + Endpoints: endpoints, + DialTimeout: 5 * time.Second, + } + client, err := clientv3.New(cfg) + if err != nil { + t.Fatal(err) + } + + kvp := NewKvProxy(client) + + kvts := &kvproxyTestServer{ + kp: kvp, + } + + var opts []grpc.ServerOption + kvts.server = grpc.NewServer(opts...) + pb.RegisterKVServer(kvts.server, kvts.kp) + + kvts.l, err = net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + + go kvts.server.Serve(kvts.l) + + return kvts +}