Make etcd voting members responsible for managing learners (#2399)

pkg/cluster/managed.go

@@ -31,7 +31,7 @@ func (c *Cluster) testClusterDB(ctx context.Context) (<-chan struct{}, error) {
 	go func() {
 		defer close(result)
 		for {
-			if err := c.managedDB.Test(ctx, c.clientAccessInfo); err != nil {
+			if err := c.managedDB.Test(ctx); err != nil {
 				logrus.Infof("Failed to test data store connection: %v", err)
 			} else {
 				logrus.Info(c.managedDB.EndpointName() + " data store connection OK")
@@ -65,7 +65,7 @@ func (c *Cluster) start(ctx context.Context) error {
 		} else {
 			return fmt.Errorf("cluster-reset was successfully performed, please remove the cluster-reset flag and start %s normally, if you need to perform another cluster reset, you must first manually delete the %s file", version.Program, resetFile)
 		}
-		return c.managedDB.Reset(ctx, c.clientAccessInfo)
+		return c.managedDB.Reset(ctx)
 	}
 	// removing the reset file and ignore error if the file doesnt exist
 	os.Remove(resetFile)

pkg/cluster/managed/drivers.go

@@ -16,9 +16,9 @@ var (
 type Driver interface {
 	IsInitialized(ctx context.Context, config *config.Control) (bool, error)
 	Register(ctx context.Context, config *config.Control, handler http.Handler) (http.Handler, error)
-	Reset(ctx context.Context, clientAccessInfo *clientaccess.Info) error
+	Reset(ctx context.Context) error
 	Start(ctx context.Context, clientAccessInfo *clientaccess.Info) error
-	Test(ctx context.Context, clientAccessInfo *clientaccess.Info) error
+	Test(ctx context.Context) error
 	Restore(ctx context.Context) error
 	EndpointName() string
 }

pkg/daemons/executor/etcd.go

@@ -26,8 +26,12 @@ func (e Embedded) ETCD(args ETCDConfig) error {
 	}
 
 	go func() {
-		err := <-etcd.Err()
-		logrus.Fatalf("etcd exited: %v", err)
+		select {
+		case <-etcd.Server.StopNotify():
+			logrus.Fatalf("etcd stopped - if this node was removed from the cluster, you must backup and delete %s before rejoining", args.DataDir)
+		case err := <-etcd.Err():
+			logrus.Fatalf("etcd exited: %v", err)
+		}
 	}()
 	return nil
 }

pkg/daemons/executor/executor.go

@@ -40,6 +40,8 @@ type ETCDConfig struct {
 	ForceNewCluster     bool        `json:"force-new-cluster,omitempty"`
 	HeartbeatInterval   int         `json:"heartbeat-interval"`
 	ElectionTimeout     int         `json:"election-timeout"`
+	Logger              string      `json:"logger"`
+	LogOutputs          []string    `json:"log-outputs"`
 }
 
 type ServerTrust struct {