update calculation, remove relation to bootstrap, update test

agent/config/builder.go

@@ -1090,10 +1090,6 @@ func (b *Builder) Validate(rt RuntimeConfig) error {
 		}
 	}
 
-	//MinQuorum is set to BootstrarpExpect if available
-	if rt.BootstrapExpect != 0 {
-		rt.AutopilotMinQuorum = uint(rt.BootstrapExpect)
-	}
 	// Validate the given Connect CA provider config
 	validCAProviders := map[string]bool{
 		"":                       true,

agent/consul/autopilot/autopilot.go

@@ -234,7 +234,7 @@ func (a *Autopilot) pruneDeadServers() error {
 
 	// Only do removals if a minority of servers will be affected.
 	peers := NumPeers(raftConfig)
-	if peers-removalCount > int(conf.MinQuorum) && removalCount < peers/2 {
+	if peers-removalCount >= int(conf.MinQuorum) && removalCount < peers/2 {
 		for _, node := range failed {
 			a.logger.Printf("[INFO] autopilot: Attempting removal of failed server node %q", node.Name)
 			go serfLAN.RemoveFailedNode(node.Name)

agent/consul/autopilot_test.go

@@ -377,6 +377,7 @@ func TestAutopilot_BootstrapExpect(t *testing.T) {
 		c.Datacenter = dc
 		c.Bootstrap = false
 		c.BootstrapExpect = 3
+		c.AutopilotConfig.MinQuorum = 3
 		c.RaftConfig.ProtocolVersion = raft.ProtocolVersion(2)
 		c.AutopilotInterval = 100 * time.Millisecond
 		//Let us know when a server is actually gone