Sync from server repo (c9992e7be4e)

commands/cluster_command_launcher.go

@@ -84,6 +84,9 @@ const (
 	connFlag                    = "conn"
 	connKey                     = "conn"
 	stopNodeFlag                = "stop-hosts"
+	// VER-90436: restart -> start
+	startNodeFlag = "restart"
+	startHostFlag = "start-hosts"
 )
 
 // Flag and key for database replication

commands/cmd_restart_node.go

@@ -16,6 +16,8 @@
 package commands
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/vertica/vcluster/vclusterops"
 	"github.com/vertica/vcluster/vclusterops/util"
@@ -30,8 +32,11 @@ type CmdRestartNodes struct {
 	CmdBase
 	restartNodesOptions *vclusterops.VStartNodesOptions
 
-	// Comma-separated list of vnode=host
-	vnodeListStr map[string]string
+	// comma-separated list of vnode=host
+	vnodeHostMap map[string]string
+
+	// comma-separated list of hosts
+	rawStartHostList []string
 }
 
 func makeCmdRestartNodes() *cobra.Command {
@@ -76,26 +81,36 @@ Examples:
 	// local flags
 	newCmd.setLocalFlags(cmd)
 
-	// require nodes to restart
-	markFlagsRequired(cmd, []string{"restart"})
+	// require nodes or hosts to restart
+	cmd.MarkFlagsOneRequired([]string{startNodeFlag, startHostFlag}...)
 
 	return cmd
 }
 
 // setLocalFlags will set the local flags the command has
 func (c *CmdRestartNodes) setLocalFlags(cmd *cobra.Command) {
 	cmd.Flags().StringToStringVar(
-		&c.vnodeListStr,
-		"restart",
+		&c.vnodeHostMap,
+		startNodeFlag,
 		map[string]string{},
 		"Comma-separated list of <node_name=re_ip_host> pairs part of the database nodes that need to be restarted",
 	)
+	cmd.Flags().StringSliceVar(
+		&c.rawStartHostList,
+		startHostFlag,
+		[]string{},
+		"Comma-separated list of hosts that need to be started",
+	)
 	cmd.Flags().IntVar(
 		&c.restartNodesOptions.StatePollingTimeout,
 		"timeout",
 		util.DefaultTimeoutSeconds,
 		"The timeout (in seconds) to wait for polling node state operation",
 	)
+
+	// VER-90436: restart -> start
+	// users only input --restart or --start-hosts
+	cmd.MarkFlagsMutuallyExclusive([]string{startNodeFlag, startHostFlag}...)
 }
 
 func (c *CmdRestartNodes) Parse(inputArgv []string, logger vlog.Printer) error {
@@ -112,12 +127,23 @@ func (c *CmdRestartNodes) Parse(inputArgv []string, logger vlog.Printer) error {
 
 func (c *CmdRestartNodes) validateParse(logger vlog.Printer) error {
 	logger.Info("Called validateParse()")
-	err := c.restartNodesOptions.ParseNodesList(c.vnodeListStr)
-	if err != nil {
-		return err
+
+	// VER-90436: restart -> start
+	// the node-host map can be loaded from the value of
+	// either --restart or --start-hosts
+	if len(c.rawStartHostList) > 0 {
+		err := c.buildRestartNodeHostMap()
+		if err != nil {
+			return err
+		}
+	} else {
+		err := c.restartNodesOptions.ParseNodesList(c.vnodeHostMap)
+		if err != nil {
+			return err
+		}
 	}
 
-	err = c.getCertFilesFromCertPaths(&c.restartNodesOptions.DatabaseOptions)
+	err := c.getCertFilesFromCertPaths(&c.restartNodesOptions.DatabaseOptions)
 	if err != nil {
 		return err
 	}
@@ -153,3 +179,31 @@ func (c *CmdRestartNodes) Run(vcc vclusterops.ClusterCommands) error {
 func (c *CmdRestartNodes) SetDatabaseOptions(opt *vclusterops.DatabaseOptions) {
 	c.restartNodesOptions.DatabaseOptions = *opt
 }
+
+func (c *CmdRestartNodes) buildRestartNodeHostMap() error {
+	dbConfig, err := readConfig()
+	if err != nil {
+		return fmt.Errorf("--start-hosts can only be used when "+
+			"the config file is available, detail: %w", err)
+	}
+
+	hostNodeMap := make(map[string]string)
+	for _, n := range dbConfig.Nodes {
+		hostNodeMap[n.Address] = n.Name
+	}
+
+	for _, rawHost := range c.rawStartHostList {
+		ip, err := util.ResolveToOneIP(rawHost, c.restartNodesOptions.IPv6)
+		if err != nil {
+			return err
+		}
+		nodeName, ok := hostNodeMap[ip]
+		if !ok {
+			return fmt.Errorf("cannot find the address %s (of host %s) from the config file",
+				ip, rawHost)
+		}
+		c.restartNodesOptions.Nodes[nodeName] = ip
+	}
+
+	return nil
+}

commands/user_input_test.go

@@ -124,3 +124,22 @@ func TestCreateConnection(t *testing.T) {
 	assert.Equal(t, dbName, dbConn.TargetDBName)
 	assert.Equal(t, hosts, dbConn.TargetHosts[0])
 }
+
+// VER-90436: restart -> start
+func TestStartNode(t *testing.T) {
+	// either --restart or --start-hosts must be specified
+	err := simulateVClusterCli("vcluster restart_node")
+	assert.ErrorContains(t, err, "at least one of the flags in the group [restart start-hosts] is required")
+
+	// --restart should be followed with the key1=value1,key2=value2 format
+	err = simulateVClusterCli("vcluster restart_node --restart host1")
+	assert.ErrorContains(t, err, `"--restart" flag: host1 must be formatted as key=value`)
+
+	// --start-hosts should be used with the config file
+	err = simulateVClusterCli("vcluster restart_node --start-hosts host1")
+	assert.ErrorContains(t, err, "--start-hosts can only be used when the config file is available")
+
+	// --restart or --start-hosts cannot be both specified
+	err = simulateVClusterCli("vcluster restart_node --restart node1=host1 --start-hosts host1")
+	assert.ErrorContains(t, err, "[restart start-hosts] were all set")
+}

vclusterops/start_node.go

@@ -67,6 +67,7 @@ func VStartNodesOptionsFactory() VStartNodesOptions {
 
 func (options *VStartNodesOptions) setDefaultValues() {
 	options.DatabaseOptions.setDefaultValues()
+	options.Nodes = make(map[string]string)
 }
 
 func (options *VStartNodesOptions) validateParseOptions(logger vlog.Printer) error {
@@ -90,7 +91,6 @@ func (options *VStartNodesOptions) analyzeOptions() (err error) {
 // For example, map[string]string{vnodeName1: host1, vnodeName2: host2} is converted to
 // map[string]string{vnodeName1: 192.168.1.101, vnodeName2: 192.168.1.102}
 func (options *VStartNodesOptions) ParseNodesList(rawNodeMap map[string]string) error {
-	options.Nodes = make(map[string]string)
 	for k, v := range rawNodeMap {
 		ip, err := util.ResolveToOneIP(v, options.IPv6)
 		if err != nil {