Disallow -bootstrap-expect flag in dev mode

hashicorp · Nov 3, 2016 · 87d8eff · 87d8eff
1 parent 9f2c965
commit 87d8eff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/command/agent/command.go b/command/agent/command.go
@@ -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")

diff --git a/consul/serf.go b/consul/serf.go
@@ -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()
 		}