etcdserver: use v3server interface
parent
523567bcc7
commit
9ff7075ce8
|
@ -21,10 +21,10 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type handler struct {
|
type handler struct {
|
||||||
server etcdserver.Server
|
server etcdserver.V3DemoServer
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(s etcdserver.Server) pb.EtcdServer {
|
func New(s etcdserver.V3DemoServer) pb.EtcdServer {
|
||||||
return &handler{s}
|
return &handler{s}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,6 @@ import (
|
||||||
|
|
||||||
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
|
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
|
||||||
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
|
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
|
||||||
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
|
|
||||||
"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/discovery"
|
"github.com/coreos/etcd/discovery"
|
||||||
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
|
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
|
||||||
|
@ -109,7 +108,6 @@ type Server interface {
|
||||||
Leader() types.ID
|
Leader() types.ID
|
||||||
// Do takes a request and attempts to fulfill it, returning a Response.
|
// Do takes a request and attempts to fulfill it, returning a Response.
|
||||||
Do(ctx context.Context, r pb.Request) (Response, error)
|
Do(ctx context.Context, r pb.Request) (Response, error)
|
||||||
V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message
|
|
||||||
// Process takes a raft message and applies it to the server's raft state
|
// Process takes a raft message and applies it to the server's raft state
|
||||||
// machine, respecting any timeout of the given context.
|
// machine, respecting any timeout of the given context.
|
||||||
Process(ctx context.Context, m raftpb.Message) error
|
Process(ctx context.Context, m raftpb.Message) error
|
||||||
|
|
|
@ -20,6 +20,10 @@ import (
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type V3DemoServer interface {
|
||||||
|
V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message
|
||||||
|
}
|
||||||
|
|
||||||
func (s *EtcdServer) V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message {
|
func (s *EtcdServer) V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message {
|
||||||
switch {
|
switch {
|
||||||
case r.Range != nil:
|
case r.Range != nil:
|
||||||
|
@ -55,5 +59,4 @@ func (s *EtcdServer) V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) pro
|
||||||
default:
|
default:
|
||||||
panic("not implemented")
|
panic("not implemented")
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue