Skip to content

Commit

Permalink
Merge #93294 #93342
Browse files Browse the repository at this point in the history
93294: dev: do not log noisy bep flag r=rickystewart a=healthy-pod

Release note: None
Epic: none

93342: sql: partition lease table when optimizing system database for MR r=ajwerner a=ajwerner

This is an oversight from #92588. Testing will come in #92826.

Epic: CRDB-18596

Release note: None

Co-authored-by: healthy-pod <[email protected]>
Co-authored-by: Ahmad Abedalqader <[email protected]>
Co-authored-by: Andrew Werner <[email protected]>
  • Loading branch information
3 people committed Dec 10, 2022
3 parents 072ec8d + 3364cac + de840a7 commit 1a18270
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dev
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion pkg/cmd/dev/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/cmd/dev/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/region_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -2470,6 +2470,7 @@ func (p *planner) OptimizeSystemDatabase(ctx context.Context) error {
rbrTables := []string{
"sqlliveness",
"sql_instances",
"lease",
}

if !systemschema.TestSupportMultiRegion() {
Expand Down

0 comments on commit 1a18270

Please sign in to comment.