Merge pull request #3077 from yichengq/fix-test-sync
etcdserver: init raft internal var earlyrelease-2.1
commit
5be545b872
|
@ -109,9 +109,6 @@ type raftNode struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *raftNode) run() {
|
func (r *raftNode) run() {
|
||||||
r.stopped = make(chan struct{})
|
|
||||||
r.done = make(chan struct{})
|
|
||||||
|
|
||||||
var syncC <-chan time.Time
|
var syncC <-chan time.Time
|
||||||
|
|
||||||
defer r.stop()
|
defer r.stop()
|
||||||
|
|
|
@ -152,6 +152,8 @@ func TestStopRaftWhenWaitingForApplyDone(t *testing.T) {
|
||||||
storage: &storageRecorder{},
|
storage: &storageRecorder{},
|
||||||
raftStorage: raft.NewMemoryStorage(),
|
raftStorage: raft.NewMemoryStorage(),
|
||||||
transport: &nopTransporter{},
|
transport: &nopTransporter{},
|
||||||
|
stopped: make(chan struct{}),
|
||||||
|
done: make(chan struct{}),
|
||||||
}
|
}
|
||||||
r.s = &EtcdServer{r: r}
|
r.s = &EtcdServer{r: r}
|
||||||
go r.run()
|
go r.run()
|
||||||
|
|
|
@ -416,6 +416,8 @@ func (s *EtcdServer) run() {
|
||||||
// TODO: get rid of the raft initialization in etcd server
|
// TODO: get rid of the raft initialization in etcd server
|
||||||
s.r.s = s
|
s.r.s = s
|
||||||
s.r.applyc = make(chan apply)
|
s.r.applyc = make(chan apply)
|
||||||
|
s.r.stopped = make(chan struct{})
|
||||||
|
s.r.done = make(chan struct{})
|
||||||
go s.r.run()
|
go s.r.run()
|
||||||
defer func() {
|
defer func() {
|
||||||
s.r.stopped <- struct{}{}
|
s.r.stopped <- struct{}{}
|
||||||
|
|
Loading…
Reference in New Issue