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

raft: stop the node synchronously

release-2.0
Xiang Li 2014-11-12 12:32:20 -08:00
parent 45c36a0808
commit d834324e97
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
raft/node.go
View File

@ -192,6 +192,7 @@ type node struct {
advancec chan struct{} advancec chan struct{}
tickc chan struct{} tickc chan struct{}
done chan struct{} done chan struct{}
stop chan struct{}
} }
func newNode() node { func newNode() node {
@ -204,11 +205,13 @@ func newNode() node {
advancec: make(chan struct{}), advancec: make(chan struct{}),
tickc: make(chan struct{}), tickc: make(chan struct{}),
done: make(chan struct{}), done: make(chan struct{}),
stop: make(chan struct{}),
} }
} }
func (n *node) Stop() { func (n *node) Stop() {
close(n.done) n.stop <- struct{}{}
<-n.stop
} }
func (n *node) run(r *raft) { func (n *node) run(r *raft) {
@ -302,7 +305,9 @@ func (n *node) run(r *raft) {
} }
r.raftLog.stableTo(prevLastUnstablei) r.raftLog.stableTo(prevLastUnstablei)
advancec = nil advancec = nil
case <-n.done: case <-n.stop:
n.stop <- struct{}{}
close(n.done)
return return
} }
} }