roachprod: remove c.TargetNodes

This was a vestigial method from when c.Nodes was a list
of ints instead of Nodes to convert c.Nodes to []Nodes.
Now that it is no longer needed, we can remove it entirely.

Author: DarrylWong

pkg/roachprod/install/cluster_synced.go

@@ -70,6 +70,10 @@ type SyncedCluster struct {
 
 	// Nodes is used by most commands (e.g. Start, Stop, Monitor). It describes
 	// the list of nodes the operation pertains to.
+	//	$ roachprod create local -n 4
+	//	$ roachprod start local          # [1, 2, 3, 4]
+	//	$ roachprod start local:2-4      # [2, 3, 4]
+	//	$ roachprod start local:2,1,4    # [1, 2, 4]
 	Nodes Nodes
 
 	ClusterSettings
@@ -239,17 +243,6 @@ func (c *SyncedCluster) localVMDir(n Node) string {
 	return local.VMDir(c.Name, int(n))
 }
 
-// TargetNodes is the fully expanded, ordered list of nodes that any given
-// roachprod command is intending to target.
-//
-//	$ roachprod create local -n 4
-//	$ roachprod start local          # [1, 2, 3, 4]
-//	$ roachprod start local:2-4      # [2, 3, 4]
-//	$ roachprod start local:2,1,4    # [1, 2, 4]
-func (c *SyncedCluster) TargetNodes() Nodes {
-	return append(Nodes{}, c.Nodes...)
-}
-
 // GetInternalIP returns the internal IP address of the specified node.
 func (c *SyncedCluster) GetInternalIP(n Node) (string, error) {
 	if c.IsLocal() {

pkg/roachprod/install/cockroach.go

@@ -405,7 +405,7 @@ func (c *SyncedCluster) fetchVersion(
 // Starting the first node is special-cased quite a bit, it's used to distribute
 // certs, set cluster settings, and initialize the cluster. Also, if we're only
 // starting a single node in the cluster and it happens to be the "first" node
-// (node 1, as understood by SyncedCluster.TargetNodes), we use
+// (node 1, as understood by SyncedCluster.Nodes), we use
 // `start-single-node` (this was written to provide a short hand to start a
 // single node cluster with a replication factor of one).
 func (c *SyncedCluster) Start(ctx context.Context, l *logger.Logger, startOpts StartOpts) error {
@@ -1306,7 +1306,7 @@ func (c *SyncedCluster) createAdminUserForSecureCluster(
 	retryOpts := retry.Options{MaxRetries: 20}
 	if err := retryOpts.Do(ctx, func(ctx context.Context) error {
 		// We use the first node in the virtual cluster to create the user.
-		firstNode := c.TargetNodes()[0]
+		firstNode := c.Nodes[0]
 		results, err := c.ExecSQL(
 			ctx, l, Nodes{firstNode}, virtualClusterName, sqlInstance, AuthRootCert, "", /* database */
 			[]string{"-e", stmts})
@@ -1509,7 +1509,7 @@ func (c *SyncedCluster) distributeCerts(ctx context.Context, l *logger.Logger) e
 	if !c.Secure {
 		return nil
 	}
-	for _, node := range c.TargetNodes() {
+	for _, node := range c.Nodes {
 		if node == 1 {
 			return c.DistributeCerts(ctx, l, false)
 		}

pkg/roachprod/install/monitor.go

@@ -346,7 +346,7 @@ func (c *SyncedCluster) Monitor(
 ) chan NodeMonitorInfo {
 	ch := make(chan NodeMonitorInfo)
 
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	var wg sync.WaitGroup
 	monitorCtx, cancel := context.WithCancel(ctx)
 

pkg/roachprod/roachprod.go

@@ -433,7 +433,7 @@ func Run(
 	}
 	// If no nodes were specified, run on nodes derived from the clusterName.
 	if len(options.Nodes) == 0 {
-		options.Nodes = c.TargetNodes()
+		options.Nodes = c.Nodes
 	}
 
 	cmd := strings.TrimSpace(strings.Join(cmdArray, " "))
@@ -461,7 +461,7 @@ func RunWithDetails(
 	}
 	// If no nodes were specified, run on nodes derived from the clusterName.
 	if len(options.Nodes) == 0 {
-		options.Nodes = c.TargetNodes()
+		options.Nodes = c.Nodes
 	}
 	cmd := strings.TrimSpace(strings.Join(cmdArray, " "))
 	return c.RunWithDetails(ctx, l, options, TruncateString(cmd, 30), cmd)
@@ -557,7 +557,7 @@ func IP(l *logger.Logger, clusterName string, external bool) ([]string, error) {
 		return nil, err
 	}
 
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	ips := make([]string, len(nodes))
 
 	for i := 0; i < len(nodes); i++ {
@@ -1126,7 +1126,7 @@ func PgURL(
 	if err != nil {
 		return nil, err
 	}
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	ips := make([]string, len(nodes))
 	if opts.External {
 		for i := 0; i < len(nodes); i++ {
@@ -1262,7 +1262,7 @@ func AdminURL(
 		virtualClusterName: virtualClusterName,
 		sqlInstance:        sqlInstance,
 	}
-	return urlGenerator(ctx, c, l, c.TargetNodes(), uConfig)
+	return urlGenerator(ctx, c, l, c.Nodes, uConfig)
 }
 
 // SQLPorts finds the SQL ports for a cluster.
@@ -1350,7 +1350,7 @@ func Pprof(ctx context.Context, l *logger.Logger, clusterName string, opts Pprof
 
 	httpClient := httputil.NewClientWithTimeout(timeout)
 	startTime := timeutil.Now().Unix()
-	err = c.Parallel(ctx, l, install.WithNodes(c.TargetNodes()).WithDisplay(description),
+	err = c.Parallel(ctx, l, install.WithNodes(c.Nodes).WithDisplay(description),
 		func(ctx context.Context, node install.Node) (*install.RunResultDetails, error) {
 			res := &install.RunResultDetails{Node: node}
 			host := c.Host(node)
@@ -2131,7 +2131,7 @@ func CreateSnapshot(
 		return nil, err
 	}
 
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	nodesStatus, err := c.Status(ctx, l)
 
 	if err != nil {
@@ -2263,13 +2263,13 @@ func ApplySnapshots(
 		return err
 	}
 
-	if n := len(c.TargetNodes()); n != len(snapshots) {
+	if n := len(c.Nodes); n != len(snapshots) {
 		return fmt.Errorf("mismatched number of snapshots (%d) to node count (%d)", len(snapshots), n)
 		// TODO(irfansharif): Validate labels (version, instance types).
 	}
 
 	// Detach and delete existing volumes. This is destructive.
-	if err := c.Parallel(ctx, l, install.WithNodes(c.TargetNodes()),
+	if err := c.Parallel(ctx, l, install.WithNodes(c.Nodes),
 		func(ctx context.Context, node install.Node) (*install.RunResultDetails, error) {
 			res := &install.RunResultDetails{Node: node}
 
@@ -2294,7 +2294,7 @@ func ApplySnapshots(
 		return err
 	}
 
-	return c.Parallel(ctx, l, install.WithNodes(c.TargetNodes()),
+	return c.Parallel(ctx, l, install.WithNodes(c.Nodes),
 		func(ctx context.Context, node install.Node) (*install.RunResultDetails, error) {
 			res := &install.RunResultDetails{Node: node}
 
@@ -2406,7 +2406,7 @@ func StartJaeger(
 	// install from source or get linux binaries and start them
 	// with systemd. For now this just matches what we've been
 	// copy and pasting.
-	jaegerNode := c.TargetNodes()[len(c.TargetNodes())-1:]
+	jaegerNode := c.Nodes[len(c.Nodes)-1:]
 	err = install.InstallTool(ctx, l, c, jaegerNode, "docker", l.Stdout, l.Stderr)
 	if err != nil {
 		return err
@@ -2458,7 +2458,7 @@ func StopJaeger(ctx context.Context, l *logger.Logger, clusterName string) error
 	if err != nil {
 		return err
 	}
-	jaegerNode := c.TargetNodes()[len(c.TargetNodes())-1:]
+	jaegerNode := c.Nodes[len(c.Nodes)-1:]
 	stopCmd := fmt.Sprintf("docker stop %s", jaegerContainerName)
 	err = c.Run(ctx, l, l.Stdout, l.Stderr, install.WithNodes(jaegerNode), stopCmd, stopCmd)
 	if err != nil {
@@ -2477,7 +2477,7 @@ func JaegerURL(
 	if err != nil {
 		return "", err
 	}
-	jaegerNode := c.TargetNodes()[len(c.TargetNodes())-1:]
+	jaegerNode := c.Nodes[len(c.Nodes)-1:]
 	urls, err := urlGenerator(ctx, c, l, jaegerNode, urlConfig{
 		usePublicIP:   true,
 		openInBrowser: openInBrowser,
@@ -2619,7 +2619,7 @@ func StorageCollectionPerformAction(
 }
 
 func printNodeToVolumeMapping(c *install.SyncedCluster) {
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	for _, n := range nodes {
 		cVM := c.VMs[n-1]
 		for _, volume := range cVM.NonBootAttachedVolumes {
@@ -2633,7 +2633,7 @@ func printNodeToVolumeMapping(c *install.SyncedCluster) {
 func sendCaptureCommand(
 	ctx context.Context, l *logger.Logger, c *install.SyncedCluster, action string, captureDir string,
 ) error {
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	httpClient := httputil.NewClientWithTimeout(0 /* timeout: None */)
 	_, _, err := c.ParallelE(ctx, l, install.WithNodes(nodes).WithDisplay(fmt.Sprintf("Performing workload capture %s", action)),
 		func(ctx context.Context, node install.Node) (*install.RunResultDetails, error) {
@@ -2713,7 +2713,7 @@ func createAttachMountVolumes(
 	opts vm.VolumeCreateOpts,
 	mountDir string,
 ) error {
-	nodes := c.TargetNodes()
+	nodes := c.Nodes
 	for idx, n := range nodes {
 		curNode := nodes[idx : idx+1]
 
@@ -2780,7 +2780,7 @@ func CreateLoadBalancer(
 	// Find the SQL ports for the service on all nodes.
 	services, err := c.DiscoverServices(
 		ctx, virtualClusterName, install.ServiceTypeSQL,
-		install.ServiceNodePredicate(c.TargetNodes()...), install.ServiceInstancePredicate(sqlInstance),
+		install.ServiceNodePredicate(c.Nodes...), install.ServiceInstancePredicate(sqlInstance),
 	)
 	if err != nil {
 		return err
@@ -2909,7 +2909,7 @@ func Deploy(
 	}
 
 	stageDir := "stage-cockroach"
-	err = c.Run(ctx, l, l.Stdout, l.Stderr, install.WithNodes(c.TargetNodes()), "creating staging dir",
+	err = c.Run(ctx, l, l.Stdout, l.Stderr, install.WithNodes(c.Nodes), "creating staging dir",
 		fmt.Sprintf("rm -rf %[1]s && mkdir -p %[1]s", stageDir))
 	if err != nil {
 		return err
@@ -2919,7 +2919,7 @@ func Deploy(
 		if pathToBinary == "" {
 			return errors.Errorf("%s application requires a path to the binary", applicationName)
 		}
-		err = c.Put(ctx, l, c.TargetNodes(), pathToBinary, filepath.Join(stageDir, "cockroach"))
+		err = c.Put(ctx, l, c.Nodes, pathToBinary, filepath.Join(stageDir, "cockroach"))
 	} else {
 		err = Stage(ctx, l, clusterName, "", "", stageDir, applicationName, version)
 	}
@@ -2929,7 +2929,7 @@ func Deploy(
 	}
 
 	l.Printf("Performing rolling restart of %d nodes on %s", len(c.VMs), clusterName)
-	for _, node := range c.TargetNodes() {
+	for _, node := range c.Nodes {
 		curNode := []install.Node{node}
 
 		err = c.WithNodes(curNode).Stop(ctx, l, sig, wait, gracePeriod, "")