Merge #155478 #155632

craig[bot] · kyle-a-wong · craig[bot] · commit 72c138e35e60 · 2025-10-17T18:33:03.000Z
155478: cli: allow internal table usage for cli tools r=kyle-a-wong a=kyle-a-wong Various cockroach cli tools query internal tables as regular operations. This includes things like running tsdumps, debug zips, getting statement diagnostics bundles, etc. These tools are expected to be able to query and access internal tables without errors or audit logging. To do this, the app name used for these tools are being changed to have the prefix: `$ internal `. This allows for the CheckInternalAccess API to skip the check. Note: the sql cli does not set this internal app name. Certain actions and internal checks / queries have been updated to temporarily set the application name to an internal one in order to run internal queries. Resolves: [CRDB-55062](https://cockroachlabs.atlassian.net/browse/CRDB-55062) Epic: [CRDB-55276](https://cockroachlabs.atlassian.net/browse/CRDB-55276) Release note: None 155632: workload: fix tpcc unsafe_internals_accessed logs r=kyle-a-wong a=kyle-a-wong The tpcc workload started generating a lot of unsafe_internals_accessed logs due to the use of `crdb_internal.force_error`. This PR fixes this by replacing the usage of `crdb_internal.force_error` with `(1/0)::INT` which provides the same functionality of forcing an error without using an internal built in. Epic: None Release note: None Co-authored-by: Kyle Wong <37189875+kyle-a-wong@users.noreply.github.com>
diff --git a/pkg/cli/auth.go b/pkg/cli/auth.go
@@ -17,13 +17,16 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlexec"
 	"github.com/cockroachdb/cockroach/pkg/server/authserver"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
 	isatty "github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
 )
 
+const authSessionAppName = catconstants.InternalAppNamePrefix + " cockroach auth-session"
+
 var loginCmd = &cobra.Command{
 	Use:   "login [options] <session-username>",
 	Short: "create a HTTP session and token for the given user",
@@ -89,7 +92,7 @@ func createAuthSessionToken(
 	username string,
 ) (sessionID int64, httpCookie *http.Cookie, resErr error) {
 	ctx := context.Background()
-	sqlConn, err := makeSQLClient(ctx, "cockroach auth-session login", useSystemDb)
+	sqlConn, err := makeSQLClient(ctx, authSessionAppName+" login", useSystemDb)
 	if err != nil {
 		return -1, nil, err
 	}
@@ -177,7 +180,7 @@ The user for which the HTTP sessions are revoked can be arbitrary.
 func runLogout(cmd *cobra.Command, args []string) (resErr error) {
 	username := tree.Name(args[0]).Normalize()
 	ctx := context.Background()
-	sqlConn, err := makeSQLClient(ctx, "cockroach auth-session logout", useSystemDb)
+	sqlConn, err := makeSQLClient(ctx, authSessionAppName+" logout", useSystemDb)
 	if err != nil {
 		return err
 	}
@@ -209,7 +212,7 @@ The user invoking the 'list' CLI command must be an admin on the cluster.
 
 func runAuthList(cmd *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
-	sqlConn, err := makeSQLClient(ctx, "cockroach auth-session list", useSystemDb)
+	sqlConn, err := makeSQLClient(ctx, authSessionAppName+" list", useSystemDb)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cli/clisqlclient/api.go b/pkg/cli/clisqlclient/api.go
@@ -101,6 +101,11 @@ type Conn interface {
 	// the fields may be empty if there were errors while retrieving
 	// them when the connection was established.
 	GetServerInfo() ServerInfo
+
+	// AllowExecuteInternal allows internal statements to be executed, regardless
+	// of the allow_unsafe_internals session variable. The returned function should
+	// be called after the internal statements have been executed.
+	AllowExecuteInternal(context.Context) func()
 }
 
 // ServerInfo describes the remote server.
diff --git a/pkg/cli/clisqlclient/conn.go b/pkg/cli/clisqlclient/conn.go
@@ -28,6 +28,8 @@ import (
 	"github.com/otan/gopgkrb5"
 )
 
+const InternalSqlAppName = "$ internal cockroach sql"
+
 func init() {
 	// Ensure that the CLI client commands can use GSSAPI authentication.
 	pgconn.RegisterGSSProvider(func() (pgconn.GSS, error) { return gopgkrb5.NewGSS() })
@@ -436,22 +438,7 @@ func (c *sqlConn) checkServerMetadata(ctx context.Context) error {
 	defer func(prev bool) { c.alwaysInferResultTypes = prev }(c.alwaysInferResultTypes)
 	c.alwaysInferResultTypes = false
 
-	// Metadata checks require allow_unsafe_internals to be on.
-	allowUnsafeInternals, err := c.getSessionVariable(ctx, "allow_unsafe_internals")
-	if err != nil {
-		fmt.Fprintf(c.errw, "warning: unable to retrieve allow_unsafe_internals setting: %v\n", err)
-	} else if allowUnsafeInternals == "off" {
-		// Temporarily turn on allow_unsafe_internals.
-		if err := c.Exec(ctx, "SET allow_unsafe_internals = on"); err != nil {
-			fmt.Fprintf(c.errw, "warning: unable to set allow_unsafe_internals to true: %v\n", err)
-		} else {
-			defer func() {
-				if resetErr := c.Exec(ctx, "SET allow_unsafe_internals = off"); resetErr != nil {
-					fmt.Fprintf(c.errw, "warning: unable to reset allow_unsafe_internals to false: %v\n", resetErr)
-				}
-			}()
-		}
-	}
+	defer c.AllowExecuteInternal(ctx)()
 
 	_, newServerVersion, newClusterID, err := c.GetServerMetadata(ctx)
 	if c.conn.IsClosed() {
@@ -519,6 +506,18 @@ func (c *sqlConn) checkServerMetadata(ctx context.Context) error {
 	return c.tryEnableServerExecutionTimings(ctx)
 }
 
+func (c *sqlConn) AllowExecuteInternal(ctx context.Context) func() {
+	oldApplicationName, _ := c.getSessionVariable(ctx, "application_name")
+	if strings.HasPrefix(oldApplicationName, InternalSqlAppName) {
+		// If already an internal app name, we don't need to set a new one
+		return func() {}
+	}
+	_ = c.Exec(ctx, fmt.Sprintf("SET application_name = '%s'", InternalSqlAppName))
+	return func() {
+		_ = c.Exec(ctx, fmt.Sprintf("SET application_name = '%s'", oldApplicationName))
+	}
+}
+
 // GetServerInfo returns a copy of the remote server details.
 func (c *sqlConn) GetServerInfo() ServerInfo {
 	return ServerInfo{
diff --git a/pkg/cli/clisqlshell/statement_diag.go b/pkg/cli/clisqlshell/statement_diag.go
@@ -25,7 +25,7 @@ func (c *cliState) handleStatementDiag(
 		cmd = args[0]
 		args = args[1:]
 	}
-
+	defer c.conn.AllowExecuteInternal(context.Background())()
 	var cmdErr error
 	switch cmd {
 	case "list":
diff --git a/pkg/cli/debug_job_cleanup.go b/pkg/cli/debug_job_cleanup.go
@@ -13,11 +13,14 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
 	"github.com/cockroachdb/cockroach/pkg/jobs"
 	"github.com/cockroachdb/cockroach/pkg/server/telemetry"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
 )
 
+const debugJobInfoAppName = catconstants.InternalAppNamePrefix + " cockroach debug job-cleanup-job-info"
+
 var debugJobCleanupInfoRows = &cobra.Command{
 	Use:   "job-cleanup-job-info",
 	Short: "cleans up system.job_info rows with no related system.jobs entry",
@@ -34,7 +37,7 @@ var jobCleanupInfoRowOpts = struct {
 
 func runDebugJobInfoCleanup(_ *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
-	sqlConn, err := makeSQLClient(ctx, "cockroach debug job-cleanup-job-info", useSystemDb)
+	sqlConn, err := makeSQLClient(ctx, debugJobInfoAppName, useSystemDb)
 	if err != nil {
 		return errors.Wrap(err, "could not establish connection to cluster")
 	}
diff --git a/pkg/cli/debug_job_trace.go b/pkg/cli/debug_job_trace.go
@@ -15,11 +15,14 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	tracezipper "github.com/cockroachdb/cockroach/pkg/util/tracing/zipper"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
 )
 
+const debugJobTraceAppName = catconstants.InternalAppNamePrefix + "  cockroach debug job-trace"
+
 var debugJobTraceFromClusterCmd = &cobra.Command{
 	Use:   "job-trace <job_id> --url=<cluster connection string>",
 	Short: "get the trace payloads for the executing job",
@@ -35,7 +38,7 @@ func runDebugJobTrace(_ *cobra.Command, args []string) (resErr error) {
 		return err
 	}
 	ctx := context.Background()
-	sqlConn, err := makeSQLClient(ctx, "cockroach debug job-trace", useSystemDb)
+	sqlConn, err := makeSQLClient(ctx, debugJobTraceAppName, useSystemDb)
 	if err != nil {
 		return errors.Wrap(err, "could not establish connection to cluster")
 	}
diff --git a/pkg/cli/doctor.go b/pkg/cli/doctor.go
@@ -32,6 +32,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/doctor"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/builtins"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/cockroach/pkg/util/buildutil"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/protoutil"
@@ -72,6 +73,8 @@ tables are queried either from a live cluster or from an unzipped debug.zip.
 `,
 }
 
+const doctorAppName = catconstants.InternalAppNamePrefix + " cockroach doctor"
+
 type doctorFn = func(
 	version *clusterversion.ClusterVersion,
 	descTable doctor.DescriptorTable,
@@ -117,7 +120,7 @@ Run the doctor tool system data from a live cluster specified by --url.
 		Args: cobra.NoArgs,
 		RunE: clierrorplus.MaybeDecorateError(
 			func(cmd *cobra.Command, args []string) (resErr error) {
-				sqlConn, err := makeSQLClient(context.Background(), "cockroach doctor", useSystemDb)
+				sqlConn, err := makeSQLClient(context.Background(), doctorAppName, useSystemDb)
 				if err != nil {
 					return errors.Wrap(err, "could not establish connection to cluster")
 				}
diff --git a/pkg/cli/node.go b/pkg/cli/node.go
@@ -31,6 +31,8 @@ import (
 	"google.golang.org/grpc/status"
 )
 
+const nodeAppName = catconstants.InternalAppNamePrefix + " cockroach node"
+
 var lsNodesColumnHeaders = []string{
 	"id",
 }
@@ -50,7 +52,7 @@ func runLsNodes(cmd *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
 	// TODO(ssd): We can potentially make this work against
 	// secondary tenants using sql_instances.
-	conn, err := makeTenantSQLClient(ctx, "cockroach node ls", useSystemDb, catconstants.SystemTenantName)
+	conn, err := makeTenantSQLClient(ctx, nodeAppName+" ls", useSystemDb, catconstants.SystemTenantName)
 	if err != nil {
 		return err
 	}
@@ -210,7 +212,7 @@ SELECT node_id AS id,
 FROM crdb_internal.gossip_liveness LEFT JOIN crdb_internal.gossip_nodes USING (node_id)`
 
 	ctx := context.Background()
-	conn, err := makeTenantSQLClient(ctx, "cockroach node status", useSystemDb, catconstants.SystemTenantName)
+	conn, err := makeTenantSQLClient(ctx, nodeAppName+" status", useSystemDb, catconstants.SystemTenantName)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/pkg/cli/nodelocal.go b/pkg/cli/nodelocal.go
@@ -17,6 +17,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/sql"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
 )
@@ -33,9 +34,11 @@ Uploads a file to a gateway node's local file system using a SQL connection.
 	RunE: clierrorplus.MaybeShoutError(runUpload),
 }
 
+const nodeLocalAppName = catconstants.InternalAppNamePrefix + " cockroach nodelocal"
+
 func runUpload(cmd *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
-	conn, err := makeSQLClient(ctx, "cockroach nodelocal", useSystemDb)
+	conn, err := makeSQLClient(ctx, nodeLocalAppName, useSystemDb)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cli/statement_diag.go b/pkg/cli/statement_diag.go
@@ -14,10 +14,13 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
 )
 
+const stmtDiagAppName = catconstants.InternalAppNamePrefix + " cockroach statement-diag"
+
 var stmtDiagCmd = &cobra.Command{
 	Use:   "statement-diag [command] [options]",
 	Short: "commands for managing statement diagnostics bundles",
@@ -39,7 +42,7 @@ diagnostics activation requests.`,
 func runStmtDiagList(cmd *cobra.Command, args []string) (resErr error) {
 	const timeFmt = "2006-01-02 15:04:05 MST"
 	ctx := context.Background()
-	conn, err := makeSQLClient(ctx, "cockroach statement-diag", useSystemDb)
+	conn, err := makeSQLClient(ctx, stmtDiagAppName, useSystemDb)
 	if err != nil {
 		return err
 	}
@@ -128,7 +131,7 @@ func runStmtDiagDownload(cmd *cobra.Command, args []string) (resErr error) {
 		filename = fmt.Sprintf("stmt-bundle-%d.zip", id)
 	}
 	ctx := context.Background()
-	conn, err := makeSQLClient(ctx, "cockroach statement-diag", useSystemDb)
+	conn, err := makeSQLClient(ctx, stmtDiagAppName, useSystemDb)
 	if err != nil {
 		return err
 	}
@@ -153,7 +156,7 @@ command, or delete all bundles.`,
 
 func runStmtDiagDelete(cmd *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
-	conn, err := makeSQLClient(ctx, "cockroach statement-diag", useSystemDb)
+	conn, err := makeSQLClient(ctx, stmtDiagAppName, useSystemDb)
 	if err != nil {
 		return err
 	}
@@ -188,7 +191,7 @@ list command, or cancel all outstanding requests.`,
 
 func runStmtDiagCancel(cmd *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
-	conn, err := makeSQLClient(ctx, "cockroach statement-diag", useSystemDb)
+	conn, err := makeSQLClient(ctx, stmtDiagAppName, useSystemDb)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cli/tsdump.go b/pkg/cli/tsdump.go
@@ -27,6 +27,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/cockroach/pkg/ts"
 	"github.com/cockroachdb/cockroach/pkg/ts/tsdumpmeta"
 	"github.com/cockroachdb/cockroach/pkg/ts/tspb"
@@ -37,6 +38,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const tsDumpAppName = catconstants.InternalAppNamePrefix + " cockroach tsdump"
+
 // TODO(knz): this struct belongs elsewhere.
 // See: https://github.com/cockroachdb/cockroach/issues/49509
 var debugTimeSeriesDumpOpts = struct {
@@ -549,7 +552,7 @@ func createYAML(ctx context.Context) (resErr error) {
 
 // getStoreToNodeMapping retrieves the store-to-node mapping from the database
 func getStoreToNodeMapping(ctx context.Context) (map[string]string, error) {
-	sqlConn, err := makeSQLClient(ctx, "cockroach tsdump", useSystemDb)
+	sqlConn, err := makeSQLClient(ctx, tsDumpAppName, useSystemDb)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/cli/userfile.go b/pkg/cli/userfile.go
@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/server/telemetry"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
 	"github.com/cockroachdb/cockroach/pkg/util/humanizeutil"
 	"github.com/cockroachdb/cockroach/pkg/util/ioctx"
 	"github.com/cockroachdb/errors"
@@ -37,6 +38,7 @@ const (
 	defaultQualifiedHexNamePrefix = "defaultdb.public.userfilesx_"
 	tmpSuffix                     = ".tmp"
 	fileTableNameSuffix           = "_upload_files"
+	userFileAppName               = catconstants.InternalAppNamePrefix + " cockroach userfile"
 )
 
 var userFileUploadCmd = &cobra.Command{
@@ -90,7 +92,7 @@ atomic, and all deletions prior to the first failure will occur.
 
 func runUserFileDelete(cmd *cobra.Command, args []string) (resErr error) {
 	ctx := context.Background()
-	conn, err := makeSQLClient(ctx, "cockroach userfile", useDefaultDb)
+	conn, err := makeSQLClient(ctx, userFileAppName, useDefaultDb)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cli/zip.go b/pkg/cli/zip.go
@@ -50,6 +50,7 @@ type zipRequest struct {
 
 const (
 	debugZipCommandFlagsFileName = "debug_zip_command_flags.txt"
+	debugZipAppName              = catconstants.InternalAppNamePrefix + " cockroach zip"
 )
 
 type debugZipContext struct {
@@ -324,7 +325,7 @@ func runDebugZip(cmd *cobra.Command, args []string) (retErr error) {
 
 			zr.sqlOutputFilenameExtension = computeSQLOutputFilenameExtension(sqlExecCtx.TableDisplayFormat)
 
-			sqlConn, err := makeTenantSQLClient(ctx, catconstants.InternalAppNamePrefix+" cockroach zip", useSystemDb, tenant.TenantName)
+			sqlConn, err := makeTenantSQLClient(ctx, debugZipAppName, useSystemDb, tenant.TenantName)
 			// The zip output is sent directly into a text file, so the results should
 			// be scanned into strings.
 			_ = sqlConn.SetAlwaysInferResultTypes(false)
diff --git a/pkg/workload/tpcc/new_order.go b/pkg/workload/tpcc/new_order.go
@@ -426,7 +426,8 @@ func (n *newOrder) run(ctx context.Context, wID int) (interface{}, time.Duration
 						fmt.Sprintf(`
 						UPDATE stock
 						SET
-							s_quantity = CASE (s_i_id, s_w_id) %[1]s ELSE crdb_internal.force_error('', 'unknown case') END,
+ 						  -- force error in ELSE case with a divide by zero error
+							s_quantity = CASE (s_i_id, s_w_id) %[1]s ELSE (1/0)::INT END,
 							s_ytd = CASE (s_i_id, s_w_id) %[2]s END,
 							s_order_cnt = CASE (s_i_id, s_w_id) %[3]s END,
 							s_remote_cnt = CASE (s_i_id, s_w_id) %[4]s END

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (c *cliState) handleStatementDiag(`
`25`	`25`	`cmd = args[0]`
`26`	`26`	`args = args[1:]`
`27`	`27`	`}`
`28`		`-`
	`28`	`+ defer c.conn.AllowExecuteInternal(context.Background())()`
`29`	`29`	`var cmdErr error`
`30`	`30`	`switch cmd {`
`31`	`31`	`case "list":`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ import (`
`31`	`31`	`"google.golang.org/grpc/status"`
`32`	`32`	`)`
`33`	`33`
	`34`	`+const nodeAppName = catconstants.InternalAppNamePrefix + " cockroach node"`
	`35`	`+`
`34`	`36`	`var lsNodesColumnHeaders = []string{`
`35`	`37`	`"id",`
`36`	`38`	`}`
`@@ -50,7 +52,7 @@ func runLsNodes(cmd *cobra.Command, args []string) (resErr error) {`
`50`	`52`	`ctx := context.Background()`
`51`	`53`	`// TODO(ssd): We can potentially make this work against`
`52`	`54`	`// secondary tenants using sql_instances.`
`53`		`- conn, err := makeTenantSQLClient(ctx, "cockroach node ls", useSystemDb, catconstants.SystemTenantName)`
	`55`	`+ conn, err := makeTenantSQLClient(ctx, nodeAppName+" ls", useSystemDb, catconstants.SystemTenantName)`
`54`	`56`	`if err != nil {`
`55`	`57`	`return err`
`56`	`58`	`}`
`@@ -210,7 +212,7 @@ SELECT node_id AS id,`
`210`	`212`	FROM crdb_internal.gossip_liveness LEFT JOIN crdb_internal.gossip_nodes USING (node_id)`
`211`	`213`
`212`	`214`	`ctx := context.Background()`
`213`		`- conn, err := makeTenantSQLClient(ctx, "cockroach node status", useSystemDb, catconstants.SystemTenantName)`
	`215`	`+ conn, err := makeTenantSQLClient(ctx, nodeAppName+" status", useSystemDb, catconstants.SystemTenantName)`
`214`	`216`	`if err != nil {`
`215`	`217`	`return nil, nil, err`
`216`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"`
`18`	`18`	`"github.com/cockroachdb/cockroach/pkg/roachpb"`
`19`	`19`	`"github.com/cockroachdb/cockroach/pkg/sql"`
	`20`	`+ "github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"`
`20`	`21`	`"github.com/cockroachdb/errors"`
`21`	`22`	`"github.com/spf13/cobra"`
`22`	`23`	`)`
`@@ -33,9 +34,11 @@ Uploads a file to a gateway node's local file system using a SQL connection.`
`33`	`34`	`RunE: clierrorplus.MaybeShoutError(runUpload),`
`34`	`35`	`}`
`35`	`36`
	`37`	`+const nodeLocalAppName = catconstants.InternalAppNamePrefix + " cockroach nodelocal"`
	`38`	`+`
`36`	`39`	`func runUpload(cmd *cobra.Command, args []string) (resErr error) {`
`37`	`40`	`ctx := context.Background()`
`38`		`- conn, err := makeSQLClient(ctx, "cockroach nodelocal", useSystemDb)`
	`41`	`+ conn, err := makeSQLClient(ctx, nodeLocalAppName, useSystemDb)`
`39`	`42`	`if err != nil {`
`40`	`43`	`return err`
`41`	`44`	`}`