Merge pull request #7171 from hashicorp/update-autopilot-20200214

Update consul vendor and add MinQuorum flag

api/operator_autopilot.go

@@ -22,6 +22,10 @@ type AutopilotConfiguration struct {
 	// be behind before being considered unhealthy.
 	MaxTrailingLogs uint64
 
+	// MinQuorum sets the minimum number of servers allowed in a cluster before
+	// autopilot can prune dead servers.
+	MinQuorum uint
+
 	// ServerStabilizationTime is the minimum amount of time a server must be
 	// in a stable, healthy state before it can be added to the cluster. Only
 	// applicable with Raft protocol version 3 or higher.

client/allocrunner/groupservice_hook_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	consulapi "github.com/hashicorp/consul/api"
-	ctestutil "github.com/hashicorp/consul/testutil"
+	ctestutil "github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/nomad/client/allocrunner/interfaces"
 	"github.com/hashicorp/nomad/client/consul"
 	"github.com/hashicorp/nomad/client/taskenv"

client/allocrunner/taskrunner/envoybootstrap_hook_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 
 	consulapi "github.com/hashicorp/consul/api"
-	consultest "github.com/hashicorp/consul/testutil"
+	consultest "github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/allocrunner/interfaces"
 	"github.com/hashicorp/nomad/client/taskenv"

client/allocrunner/taskrunner/template/template_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	ctestutil "github.com/hashicorp/consul/testutil"
+	ctestutil "github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/nomad/client/config"
 	"github.com/hashicorp/nomad/client/taskenv"
 	"github.com/hashicorp/nomad/helper"

command/agent/agent.go

@@ -225,6 +225,9 @@ func convertServerConfig(agentConfig *Config) (*nomad.Config, error) {
 		if agentConfig.Autopilot.MaxTrailingLogs != 0 {
 			conf.AutopilotConfig.MaxTrailingLogs = uint64(agentConfig.Autopilot.MaxTrailingLogs)
 		}
+		if agentConfig.Autopilot.MinQuorum != 0 {
+			conf.AutopilotConfig.MinQuorum = uint(agentConfig.Autopilot.MinQuorum)
+		}
 		if agentConfig.Autopilot.EnableRedundancyZones != nil {
 			conf.AutopilotConfig.EnableRedundancyZones = *agentConfig.Autopilot.EnableRedundancyZones
 		}

command/agent/config_parse_test.go

@@ -224,6 +224,7 @@ var basicConfig = &Config{
 		LastContactThreshold:       12705 * time.Second,
 		LastContactThresholdHCL:    "12705s",
 		MaxTrailingLogs:            17849,
+		MinQuorum:                  3,
 		EnableRedundancyZones:      &trueValue,
 		DisableUpgradeMigration:    &trueValue,
 		EnableCustomUpgrades:       &trueValue,

command/agent/config_test.go

@@ -181,6 +181,7 @@ func TestConfig_Merge(t *testing.T) {
 			ServerStabilizationTime: 1 * time.Second,
 			LastContactThreshold:    1 * time.Second,
 			MaxTrailingLogs:         1,
+			MinQuorum:               1,
 			EnableRedundancyZones:   &falseValue,
 			DisableUpgradeMigration: &falseValue,
 			EnableCustomUpgrades:    &falseValue,
@@ -365,6 +366,7 @@ func TestConfig_Merge(t *testing.T) {
 			ServerStabilizationTime: 2 * time.Second,
 			LastContactThreshold:    2 * time.Second,
 			MaxTrailingLogs:         2,
+			MinQuorum:               2,
 			EnableRedundancyZones:   &trueValue,
 			DisableUpgradeMigration: &trueValue,
 			EnableCustomUpgrades:    &trueValue,

command/agent/consul/group_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/consul/api"
 	consulapi "github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/testutil"
+	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/nomad/helper/testlog"
 	"github.com/hashicorp/nomad/nomad/mock"
 	"github.com/hashicorp/nomad/nomad/structs"

command/agent/consul/int_test.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	consulapi "github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/testutil"
+	"github.com/hashicorp/consul/sdk/testutil"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/allocrunner/taskrunner"

command/agent/operator_endpoint.go

@@ -108,6 +108,7 @@ func (s *HTTPServer) OperatorAutopilotConfiguration(resp http.ResponseWriter, re
 			CleanupDeadServers:      reply.CleanupDeadServers,
 			LastContactThreshold:    reply.LastContactThreshold,
 			MaxTrailingLogs:         reply.MaxTrailingLogs,
+			MinQuorum:               reply.MinQuorum,
 			ServerStabilizationTime: reply.ServerStabilizationTime,
 			EnableRedundancyZones:   reply.EnableRedundancyZones,
 			DisableUpgradeMigration: reply.DisableUpgradeMigration,
@@ -131,6 +132,7 @@ func (s *HTTPServer) OperatorAutopilotConfiguration(resp http.ResponseWriter, re
 			CleanupDeadServers:      conf.CleanupDeadServers,
 			LastContactThreshold:    conf.LastContactThreshold,
 			MaxTrailingLogs:         conf.MaxTrailingLogs,
+			MinQuorum:               conf.MinQuorum,
 			ServerStabilizationTime: conf.ServerStabilizationTime,
 			EnableRedundancyZones:   conf.EnableRedundancyZones,
 			DisableUpgradeMigration: conf.DisableUpgradeMigration,

command/agent/operator_endpoint_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/testutil/retry"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/stretchr/testify/assert"

command/agent/testdata/basic.hcl

@@ -234,6 +234,7 @@ autopilot {
   disable_upgrade_migration = true
   last_contact_threshold    = "12705s"
   max_trailing_logs         = 17849
+  min_quorum                = 3
   enable_redundancy_zones   = true
   server_stabilization_time = "23057s"
   enable_custom_upgrades    = true

command/agent/testdata/basic.json

@@ -28,6 +28,7 @@
       "enable_redundancy_zones": true,
       "last_contact_threshold": "12705s",
       "max_trailing_logs": 17849,
+      "min_quorum": 3,
       "server_stabilization_time": "23057s"
     }
   ],

command/operator_autopilot_get.go

@@ -45,6 +45,7 @@ func (c *OperatorAutopilotGetCommand) Run(args []string) int {
 	c.Ui.Output(fmt.Sprintf("CleanupDeadServers = %v", config.CleanupDeadServers))
 	c.Ui.Output(fmt.Sprintf("LastContactThreshold = %v", config.LastContactThreshold.String()))
 	c.Ui.Output(fmt.Sprintf("MaxTrailingLogs = %v", config.MaxTrailingLogs))
+	c.Ui.Output(fmt.Sprintf("MinQuorum = %v", config.MinQuorum))
 	c.Ui.Output(fmt.Sprintf("ServerStabilizationTime = %v", config.ServerStabilizationTime.String()))
 	c.Ui.Output(fmt.Sprintf("EnableRedundancyZones = %v", config.EnableRedundancyZones))
 	c.Ui.Output(fmt.Sprintf("DisableUpgradeMigration = %v", config.DisableUpgradeMigration))

command/operator_autopilot_set.go

@@ -34,6 +34,7 @@ func (c *OperatorAutopilotSetCommand) Name() string { return "operator autopilot
 func (c *OperatorAutopilotSetCommand) Run(args []string) int {
 	var cleanupDeadServers flags.BoolValue
 	var maxTrailingLogs flags.UintValue
+	var minQuorum flags.UintValue
 	var lastContactThreshold flags.DurationValue
 	var serverStabilizationTime flags.DurationValue
 	var enableRedundancyZones flags.BoolValue
@@ -50,6 +51,7 @@ func (c *OperatorAutopilotSetCommand) Run(args []string) int {
 	f.Var(&enableRedundancyZones, "enable-redundancy-zones", "")
 	f.Var(&disableUpgradeMigration, "disable-upgrade-migration", "")
 	f.Var(&enableCustomUpgrades, "enable-custom-upgrades", "")
+	f.Var(&minQuorum, "min-quorum", "")
 
 	if err := f.Parse(args); err != nil {
 		c.Ui.Error(fmt.Sprintf("Failed to parse args: %v", err))
@@ -80,6 +82,7 @@ func (c *OperatorAutopilotSetCommand) Run(args []string) int {
 	trailing := uint(conf.MaxTrailingLogs)
 	maxTrailingLogs.Merge(&trailing)
 	conf.MaxTrailingLogs = uint64(trailing)
+	minQuorum.Merge(&conf.MinQuorum)
 	lastContactThreshold.Merge(&conf.LastContactThreshold)
 	serverStabilizationTime.Merge(&conf.ServerStabilizationTime)
 
@@ -131,6 +134,10 @@ Set Config Options:
      Controls the maximum number of log entries that a server can trail
      the leader by before being considered unhealthy.
 
+  -min-quorum=<value>
+      Controls the minimum number of servers required in a cluster
+      before autopilot can prune dead servers.
+
   -redundancy-zone-tag=<value>
      (Enterprise-only) Controls the node_meta tag name used for
      separating servers into different redundancy zones.

command/operator_autopilot_set_test.go

@@ -26,6 +26,7 @@ func TestOperatorAutopilotSetConfigCommand(t *testing.T) {
 		"-address=" + addr,
 		"-cleanup-dead-servers=false",
 		"-max-trailing-logs=99",
+		"-min-quorum=3",
 		"-last-contact-threshold=123ms",
 		"-server-stabilization-time=123ms",
 		"-enable-redundancy-zones=true",
@@ -46,6 +47,7 @@ func TestOperatorAutopilotSetConfigCommand(t *testing.T) {
 
 	require.False(conf.CleanupDeadServers)
 	require.EqualValues(99, conf.MaxTrailingLogs)
+	require.EqualValues(3, conf.MinQuorum)
 	require.EqualValues(123*time.Millisecond, conf.LastContactThreshold)
 	require.EqualValues(123*time.Millisecond, conf.ServerStabilizationTime)
 	require.True(conf.EnableRedundancyZones)

helper/freeport/freeport_test.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/hashicorp/consul/testutil/retry"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 )
 
 // reset will reverse the setup from initialize() and then redo it (for tests)

internal/testing/apitests/operator_autopilot_test.go

@@ -5,7 +5,7 @@ import (
 
 	"fmt"
 
-	"github.com/hashicorp/consul/testutil/retry"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/testutil"
 	"github.com/stretchr/testify/require"

internal/testing/apitests/operator_test.go

@@ -3,7 +3,7 @@ package apitests
 import (
 	"testing"
 
-	"github.com/hashicorp/consul/testutil/retry"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/nomad/api"
 	"github.com/stretchr/testify/require"
 )

nomad/autopilot.go

@@ -35,6 +35,7 @@ func (d *AutopilotDelegate) AutopilotConfig() *autopilot.Config {
 		CleanupDeadServers:      c.CleanupDeadServers,
 		LastContactThreshold:    c.LastContactThreshold,
 		MaxTrailingLogs:         c.MaxTrailingLogs,
+		MinQuorum:               c.MinQuorum,
 		ServerStabilizationTime: c.ServerStabilizationTime,
 		DisableUpgradeMigration: c.DisableUpgradeMigration,
 		ModifyIndex:             c.ModifyIndex,
@@ -96,6 +97,11 @@ func (d *AutopilotDelegate) Raft() *raft.Raft {
 	return d.server.raft
 }
 
-func (d *AutopilotDelegate) Serf() *serf.Serf {
+func (d *AutopilotDelegate) SerfLAN() *serf.Serf {
 	return d.server.serf
 }
+
+func (d *AutopilotDelegate) SerfWAN() *serf.Serf {
+	// serf WAN isn't supported in nomad yet
+	return nil
+}

nomad/autopilot_test.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/consul/agent/consul/autopilot"
-	"github.com/hashicorp/consul/testutil/retry"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/nomad/testutil"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"

nomad/fsm_test.go

@@ -3033,6 +3033,7 @@ func TestFSM_Autopilot(t *testing.T) {
 			CleanupDeadServers:   true,
 			LastContactThreshold: 10 * time.Second,
 			MaxTrailingLogs:      300,
+			MinQuorum:            3,
 		},
 	}
 	buf, err := structs.Encode(structs.AutopilotRequestType, req)
@@ -3058,6 +3059,9 @@ func TestFSM_Autopilot(t *testing.T) {
 	if config.MaxTrailingLogs != req.Config.MaxTrailingLogs {
 		t.Fatalf("bad: %v", config.MaxTrailingLogs)
 	}
+	if config.MinQuorum != req.Config.MinQuorum {
+		t.Fatalf("bad: %v", config.MinQuorum)
+	}
 
 	// Now use CAS and provide an old index
 	req.CAS = true

nomad/leader_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/testutil/retry"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/go-hclog"
 	memdb "github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/go-version"

nomad/server_setup_oss.go

@@ -4,15 +4,14 @@ package nomad
 
 import (
 	"github.com/hashicorp/consul/agent/consul/autopilot"
-	log "github.com/hashicorp/go-hclog"
 )
 
 type EnterpriseState struct{}
 
 func (s *Server) setupEnterprise(config *Config) error {
 	// Set up the OSS version of autopilot
 	apDelegate := &AutopilotDelegate{s}
-	s.autopilot = autopilot.NewAutopilot(s.logger.StandardLoggerIntercept(&log.StandardLoggerOptions{InferLevels: true}), apDelegate, config.AutopilotInterval, config.ServerHealthInterval)
+	s.autopilot = autopilot.NewAutopilot(s.logger, apDelegate, config.AutopilotInterval, config.ServerHealthInterval)
 
 	return nil
 }

nomad/state/autopilot_test.go

@@ -15,6 +15,7 @@ func TestStateStore_Autopilot(t *testing.T) {
 		CleanupDeadServers:      true,
 		LastContactThreshold:    5 * time.Second,
 		MaxTrailingLogs:         500,
+		MinQuorum:               3,
 		ServerStabilizationTime: 100 * time.Second,
 		EnableRedundancyZones:   true,
 		DisableUpgradeMigration: true,

nomad/structs/config/autopilot.go

@@ -26,6 +26,10 @@ type AutopilotConfig struct {
 	// be behind before being considered unhealthy.
 	MaxTrailingLogs int `hcl:"max_trailing_logs"`
 
+	// MinQuorum sets the minimum number of servers required in a cluster
+	// before autopilot can prune dead servers.
+	MinQuorum int `hcl:"min_quorum"`
+
 	// (Enterprise-only) EnableRedundancyZones specifies whether to enable redundancy zones.
 	EnableRedundancyZones *bool `hcl:"enable_redundancy_zones"`
 
@@ -73,6 +77,9 @@ func (a *AutopilotConfig) Merge(b *AutopilotConfig) *AutopilotConfig {
 	if b.MaxTrailingLogs != 0 {
 		result.MaxTrailingLogs = b.MaxTrailingLogs
 	}
+	if b.MinQuorum != 0 {
+		result.MinQuorum = b.MinQuorum
+	}
 	if b.EnableRedundancyZones != nil {
 		result.EnableRedundancyZones = b.EnableRedundancyZones
 	}

nomad/structs/config/autopilot_test.go

@@ -14,6 +14,7 @@ func TestAutopilotConfig_Merge(t *testing.T) {
 		ServerStabilizationTime: 1 * time.Second,
 		LastContactThreshold:    1 * time.Second,
 		MaxTrailingLogs:         1,
+		MinQuorum:               1,
 		EnableRedundancyZones:   &trueValue,
 		DisableUpgradeMigration: &falseValue,
 		EnableCustomUpgrades:    &trueValue,
@@ -24,6 +25,7 @@ func TestAutopilotConfig_Merge(t *testing.T) {
 		ServerStabilizationTime: 2 * time.Second,
 		LastContactThreshold:    2 * time.Second,
 		MaxTrailingLogs:         2,
+		MinQuorum:               2,
 		EnableRedundancyZones:   nil,
 		DisableUpgradeMigration: nil,
 		EnableCustomUpgrades:    nil,
@@ -34,6 +36,7 @@ func TestAutopilotConfig_Merge(t *testing.T) {
 		ServerStabilizationTime: 2 * time.Second,
 		LastContactThreshold:    2 * time.Second,
 		MaxTrailingLogs:         2,
+		MinQuorum:               2,
 		EnableRedundancyZones:   &trueValue,
 		DisableUpgradeMigration: &falseValue,
 		EnableCustomUpgrades:    &trueValue,

nomad/structs/operator.go

@@ -103,6 +103,10 @@ type AutopilotConfig struct {
 	// be behind before being considered unhealthy.
 	MaxTrailingLogs uint64
 
+	// MinQuorum sets the minimum number of servers required in a cluster
+	// before autopilot can prune dead servers.
+	MinQuorum uint
+
 	// (Enterprise-only) EnableRedundancyZones specifies whether to enable redundancy zones.
 	EnableRedundancyZones bool