cli: remove the unused return from getClientGRPCConn

Release note: None

Author: knz

pkg/cli/debug_reset_quorum.go

@@ -50,7 +50,7 @@ func runDebugResetQuorum(cmd *cobra.Command, args []string) error {
 	}
 
 	// Set up GRPC Connection for running ResetQuorum.
-	cc, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+	cc, finish, err := getClientGRPCConn(ctx, serverCfg)
 	if err != nil {
 		log.Errorf(ctx, "connection to server failed: %v", err)
 		return err

pkg/cli/debug_send_kv_batch.go

@@ -171,7 +171,7 @@ func runSendKVBatch(cmd *cobra.Command, args []string) error {
 	// Send BatchRequest.
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+	conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 	if err != nil {
 		return errors.Wrap(err, "failed to connect to the node")
 	}

pkg/cli/init.go

@@ -46,7 +46,7 @@ func runInit(cmd *cobra.Command, args []string) error {
 	if err := dialAndCheckHealth(ctx); err != nil {
 		return err
 	}
-	conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+	conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 	if err != nil {
 		return err
 	}
@@ -76,7 +76,7 @@ func dialAndCheckHealth(ctx context.Context) error {
 		// (Attempt to) establish the gRPC connection. If that fails,
 		// it may be that the server hasn't started to listen yet, in
 		// which case we'll retry.
-		conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+		conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 		if err != nil {
 			return err
 		}

pkg/cli/node.go

@@ -349,7 +349,7 @@ func runDecommissionNode(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+	conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 	if err != nil {
 		return errors.Wrap(err, "failed to connect to the node")
 	}
@@ -814,7 +814,7 @@ func runRecommissionNode(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+	conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 	if err != nil {
 		return errors.Wrap(err, "failed to connect to the node")
 	}

pkg/cli/rpc_client.go

@@ -17,7 +17,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/rpc"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
-	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/netutil/addr"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
@@ -26,13 +25,11 @@ import (
 	"google.golang.org/grpc"
 )
 
-// getClientGRPCConn returns a ClientConn, a Clock and a method that blocks
+// getClientGRPCConn returns a ClientConn and a method that blocks
 // until the connection (and its associated goroutines) have terminated.
-func getClientGRPCConn(
-	ctx context.Context, cfg server.Config,
-) (*grpc.ClientConn, hlc.WallClock, func(), error) {
+func getClientGRPCConn(ctx context.Context, cfg server.Config) (*grpc.ClientConn, func(), error) {
 	if ctx.Done() == nil {
-		return nil, nil, nil, errors.New("context must be cancellable")
+		return nil, nil, errors.New("context must be cancellable")
 	}
 	// 0 to disable max offset checks; this RPC context is not a member of the
 	// cluster, so there's no need to enforce that its max offset is the same
@@ -59,14 +56,14 @@ func getClientGRPCConn(
 	addr, err := addr.AddrWithDefaultLocalhost(cfg.AdvertiseAddr)
 	if err != nil {
 		stopper.Stop(ctx)
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 	// We use GRPCUnvalidatedDial() here because it does not matter
 	// to which node we're talking to.
 	conn, err := rpcContext.GRPCUnvalidatedDial(addr).Connect(ctx)
 	if err != nil {
 		stopper.Stop(ctx)
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 	stopper.AddCloser(stop.CloserFn(func() {
 		_ = conn.Close() // nolint:grpcconnclose
@@ -76,13 +73,13 @@ func getClientGRPCConn(
 	closer := func() {
 		stopper.Stop(ctx)
 	}
-	return conn, clock, closer, nil
+	return conn, closer, nil
 }
 
 // getAdminClient returns an AdminClient and a closure that must be invoked
 // to free associated resources.
 func getAdminClient(ctx context.Context, cfg server.Config) (serverpb.AdminClient, func(), error) {
-	conn, _, finish, err := getClientGRPCConn(ctx, cfg)
+	conn, finish, err := getClientGRPCConn(ctx, cfg)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "failed to connect to the node")
 	}
@@ -94,7 +91,7 @@ func getAdminClient(ctx context.Context, cfg server.Config) (serverpb.AdminClien
 func getStatusClient(
 	ctx context.Context, cfg server.Config,
 ) (serverpb.StatusClient, func(), error) {
-	conn, _, finish, err := getClientGRPCConn(ctx, cfg)
+	conn, finish, err := getClientGRPCConn(ctx, cfg)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "failed to connect to the node")
 	}

pkg/cli/tsdump.go

@@ -52,7 +52,7 @@ output.
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
-		conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+		conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 		if err != nil {
 			return err
 		}

pkg/cli/zip.go

@@ -161,7 +161,7 @@ func runDebugZip(cmd *cobra.Command, args []string) (retErr error) {
 	var tenants []*serverpb.Tenant
 	if err := func() error {
 		s := zr.start("discovering virtual clusters")
-		conn, _, finish, err := getClientGRPCConn(ctx, serverCfg)
+		conn, finish, err := getClientGRPCConn(ctx, serverCfg)
 		if err != nil {
 			return s.fail(err)
 		}
@@ -215,7 +215,7 @@ func runDebugZip(cmd *cobra.Command, args []string) (retErr error) {
 			sqlAddr := tenant.SqlAddr
 
 			s := zr.start("establishing RPC connection to %s", cfg.AdvertiseAddr)
-			conn, _, finish, err := getClientGRPCConn(ctx, cfg)
+			conn, finish, err := getClientGRPCConn(ctx, cfg)
 			if err != nil {
 				return s.fail(err)
 			}