diff --git a/dev b/dev old mode 100755 new mode 100644 index 94a05056ba5f..3a0a9f7da7fe --- a/dev +++ b/dev @@ -8,7 +8,7 @@ fi set -euo pipefail # Bump this counter to force rebuilding `dev` on all machines. -DEV_VERSION=66 +DEV_VERSION=67 THIS_DIR=$(cd "$(dirname "$0")" && pwd) BINARY_DIR=$THIS_DIR/bin/dev-versions diff --git a/pkg/cmd/dev/build.go b/pkg/cmd/dev/build.go index 076117b2ff1c..23f9938a79dd 100644 --- a/pkg/cmd/dev/build.go +++ b/pkg/cmd/dev/build.go @@ -169,12 +169,14 @@ func (d *dev) build(cmd *cobra.Command, commandLine []string) error { args = append(args, additionalBazelArgs...) if cross == "" { + // Do not log --build_event_binary_file=... because it is not relevant to the actual call + // from the user perspective. + logCommand("bazel", args...) if buildutil.CrdbTestBuild { args = append(args, "--build_event_binary_file=/tmp/path") } else { args = append(args, fmt.Sprintf("--build_event_binary_file=%s", filepath.Join(tmpDir, bepFileBasename))) } - logCommand("bazel", args...) if err := d.exec.CommandContextInheritingStdStreams(ctx, "bazel", args...); err != nil { return err } diff --git a/pkg/cmd/dev/test.go b/pkg/cmd/dev/test.go index e5fc8a99cdd9..4808d813b476 100644 --- a/pkg/cmd/dev/test.go +++ b/pkg/cmd/dev/test.go @@ -349,14 +349,16 @@ func (d *dev) test(cmd *cobra.Command, commandLine []string) error { args = append(args, d.getTestOutputArgs(stress, verbose, showLogs, streamOutput)...) args = append(args, additionalBazelArgs...) + logCommand("bazel", args...) + // Do not log --build_event_binary_file=... because it is not relevant to the actual call + // from the user perspective. if buildutil.CrdbTestBuild { args = append(args, "--build_event_binary_file=/tmp/path") } else { args = append(args, fmt.Sprintf("--build_event_binary_file=%s", filepath.Join(tmpDir, bepFileBasename))) } - logCommand("bazel", args...) err := d.exec.CommandContextInheritingStdStreams(ctx, "bazel", args...) if err != nil { var cmderr *exec.ExitError diff --git a/pkg/sql/region_util.go b/pkg/sql/region_util.go index 00acbb665aef..354dda1097fa 100644 --- a/pkg/sql/region_util.go +++ b/pkg/sql/region_util.go @@ -2470,6 +2470,7 @@ func (p *planner) OptimizeSystemDatabase(ctx context.Context) error { rbrTables := []string{ "sqlliveness", "sql_instances", + "lease", } if !systemschema.TestSupportMultiRegion() {