status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-24 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

consul: Disable conflict resolution. See #97.

Browse Source
This commit is contained in:
Armon Dadgar 2014-05-16 14:11:53 -07:00
parent 1611d986d6
commit e08ca71559
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consul/server.go
View File

@ -219,6 +219,11 @@ func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string, w
conf.EventCh = ch conf.EventCh = ch
conf.SnapshotPath = filepath.Join(s.config.DataDir, path) conf.SnapshotPath = filepath.Join(s.config.DataDir, path)
conf.ProtocolVersion = protocolVersionMap[s.config.ProtocolVersion] conf.ProtocolVersion = protocolVersionMap[s.config.ProtocolVersion]
// Until Consul supports this fully, we disable automatic resolution.
// When enabled, the Serf gossip may just turn off if we are the minority
// node which is rather unexpected.
conf.EnableNameConflictResolution = false
if err := ensurePath(conf.SnapshotPath, false); err != nil { if err := ensurePath(conf.SnapshotPath, false); err != nil {
return nil, err return nil, err
} }