luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Disallow -bootstrap-expect flag in dev mode (#2464)

This commit is contained in:
Kyle Havlovitz 2016-11-03 01:54:43 -04:00 committed by GitHub
parent 117a7a365e
commit 169cae2203
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/command.go
View File

@ -271,6 +271,12 @@ func (c *Command) readConfig() *Config {
return nil
}
// Expect can only work when dev mode is off
if config.BootstrapExpect > 0 && config.DevMode {
c.Ui.Error("Expect mode cannot be enabled when dev mode is enabled")
return nil
}
// Expect & Bootstrap are mutually exclusive
if config.BootstrapExpect != 0 && config.Bootstrap {
c.Ui.Error("Bootstrap cannot be provided with an expected server count")

2
consul/serf.go
View File

@ -154,7 +154,7 @@ func (s *Server) lanNodeJoin(me serf.MemberEvent) {
s.localLock.Unlock()
}
// If we still expecting to bootstrap, may need to handle this.
// If we're still expecting to bootstrap, may need to handle this.
if s.config.BootstrapExpect != 0 {
s.maybeBootstrap()
}