From bd04f2b3a2f22f9fab5b8824a1f0ada952986d96 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Thu, 30 Mar 2017 15:43:07 -0700 Subject: [PATCH] embed: add Election service --- embed/serve.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/embed/serve.go b/embed/serve.go index fb05df730ea..4f7ef30d75d 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -26,6 +26,8 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3client" + "github.com/coreos/etcd/etcdserver/api/v3election" + "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" "github.com/coreos/etcd/etcdserver/api/v3lock" "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" "github.com/coreos/etcd/etcdserver/api/v3rpc" @@ -68,10 +70,14 @@ func (sctx *serveCtx) serve(s *etcdserver.EtcdServer, tlscfg *tls.Config, handle plog.Info("ready to serve client requests") m := cmux.New(sctx.l) + v3c := v3client.New(s) + servElection := v3election.NewElectionServer(v3c) + servLock := v3lock.NewLockServer(v3c) if sctx.insecure { gs := v3rpc.Server(s, nil) - v3lockpb.RegisterLockServer(gs, v3lock.NewLockServer(v3client.New(s))) + v3electionpb.RegisterElectionServer(gs, servElection) + v3lockpb.RegisterLockServer(gs, servLock) if sctx.serviceRegister != nil { sctx.serviceRegister(gs) } @@ -99,7 +105,8 @@ func (sctx *serveCtx) serve(s *etcdserver.EtcdServer, tlscfg *tls.Config, handle if sctx.secure { gs := v3rpc.Server(s, tlscfg) - v3lockpb.RegisterLockServer(gs, v3lock.NewLockServer(v3client.New(s))) + v3electionpb.RegisterElectionServer(gs, servElection) + v3lockpb.RegisterLockServer(gs, servLock) if sctx.serviceRegister != nil { sctx.serviceRegister(gs) }