vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdserver: use context.TODO()

release-2.0
Blake Mizerany 2014-08-26 16:57:46 -07:00 committed by Yicheng Qin
parent d2b99aa7c9
commit 30fa119345
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdserver2/server.go
View File

@ -54,7 +54,7 @@ func (s *Server) Run(ctx context.Context) {
go func() {
for _, e := range rd.CommittedEntries {
var resp Response
resp.Event, resp.err = s.apply(e)
resp.Event, resp.err = s.apply(context.TODO(), e)
resp.Term = rd.Term
resp.Commit = rd.Commit
s.w.Trigger(e.Id, resp)
@ -108,9 +108,7 @@ func (s *Server) Do(ctx context.Context, r Request) (Response, error) {
}
// apply interprets r as a call to store.X and returns an Response interpreted from store.Event
func (s *Server) apply(e raft.Entry) (*store.Event, error) {
// TODO(bmizerany): apply needs to take a context.Context, but store
// doesn't have a mechanism to abort operations yet.
func (s *Server) apply(ctx context.Context, e raft.Entry) (*store.Event, error) {
var r Request
if err := r.Unmarshal(e.Data); err != nil {
return nil, err