status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename to raftNotifyCh, fix typo

This commit is contained in:
Preetha Appan 2017-07-06 09:09:21 -05:00
parent f2171a6720
commit f549c06764
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/consul/leader.go
View File

@ -36,7 +36,7 @@ func (s *Server) monitorLeadership() {
// leaderCh, which is only notified best-effort. Doing this ensures // leaderCh, which is only notified best-effort. Doing this ensures
// that we get all notifications in order, which is required for // that we get all notifications in order, which is required for
// cleanup and to ensure we never run multiple leader loops. // cleanup and to ensure we never run multiple leader loops.
raftNotifyCh := s.raftNotifyChanel raftNotifyCh := s.raftNotifyCh
var wg sync.WaitGroup var wg sync.WaitGroup
var stopCh chan struct{} var stopCh chan struct{}

10
agent/consul/server.go
View File

@ -134,9 +134,9 @@ type Server struct {
raftTransport *raft.NetworkTransport raftTransport *raft.NetworkTransport
raftInmem *raft.InmemStore raftInmem *raft.InmemStore
// raftNotifyChanel set up by setupRaft() and ensures that we get reliable leader // raftNotifyCh is set up by setupRaft() and ensures that we get reliable leader
// transition notifications from the Raft layer. // transition notifications from the Raft layer.
raftNotifyChanel <-chan bool raftNotifyCh <-chan bool
// reconcileCh is used to pass events from the serf handler // reconcileCh is used to pass events from the serf handler
// into the leader manager, so that the strong state can be // into the leader manager, so that the strong state can be
@ -601,9 +601,9 @@ func (s *Server) setupRaft() error {
} }
// Set up a channel for reliable leader notifications. // Set up a channel for reliable leader notifications.
raftReconcileChannel := make(chan bool, 1) raftNotifyCh := make(chan bool, 1)
s.config.RaftConfig.NotifyCh = raftReconcileChannel s.config.RaftConfig.NotifyCh = raftNotifyCh
s.raftNotifyChanel = raftReconcileChannel s.raftNotifyCh = raftNotifyCh
// Setup the Raft store. // Setup the Raft store.
s.raft, err = raft.NewRaft(s.config.RaftConfig, s.fsm, log, stable, snap, trans) s.raft, err = raft.NewRaft(s.config.RaftConfig, s.fsm, log, stable, snap, trans)