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

etcdserver: continue to apply after self-removed

Browse Source
This commit is contained in:
Xiang Li 2015-01-02 14:10:07 -08:00
parent 152676f43a
commit 6e727625b9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcdserver/server.go
View File

@ -695,6 +695,8 @@ func getExpirationTime(r *pb.Request) time.Time {
// The given entries should not be empty. // The given entries should not be empty.
func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (uint64, bool) { func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (uint64, bool) {
var applied uint64 var applied uint64
var shouldstop bool
var err error
for i := range es { for i := range es {
e := es[i] e := es[i]
switch e.Type { switch e.Type {
@ -705,11 +707,8 @@ func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (uint
case raftpb.EntryConfChange: case raftpb.EntryConfChange:
var cc raftpb.ConfChange var cc raftpb.ConfChange
pbutil.MustUnmarshal(&cc, e.Data) pbutil.MustUnmarshal(&cc, e.Data)
shouldstop, err := s.applyConfChange(cc, confState) shouldstop, err = s.applyConfChange(cc, confState)
s.w.Trigger(cc.ID, err) s.w.Trigger(cc.ID, err)
if shouldstop {
return applied, true
}
default: default:
log.Panicf("entry type should be either EntryNormal or EntryConfChange") log.Panicf("entry type should be either EntryNormal or EntryConfChange")
} }
@ -717,7 +716,7 @@ func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (uint
atomic.StoreUint64(&s.raftTerm, e.Term) atomic.StoreUint64(&s.raftTerm, e.Term)
applied = e.Index applied = e.Index
} }
return applied, false return applied, shouldstop
} }
// applyRequest interprets r as a call to store.X and returns a Response interpreted // applyRequest interprets r as a call to store.X and returns a Response interpreted