Skip to content

Commit 0375f11

Browse files
craig[bot]tbgrickystewart
committed
157217: mmaprototype: move rebalanceStores to its own file r=tbg a=tbg Epic: CRDB-55052 157223: build: add whether build is FIPS-enabled to `cockroach version` r=rail a=rickystewart Part of: #155643 Epic: DEVINF-815 Release note: Display whether build is FIPS-enabled in `cockroach version` Co-authored-by: Tobias Grieger <[email protected]> Co-authored-by: Ricky Stewart <[email protected]>
3 parents dd5bc70 + 483d60a + d06a661 commit 0375f11

File tree

4 files changed

+578
-552
lines changed

4 files changed

+578
-552
lines changed

pkg/build/info.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package build
77

88
import (
99
"bytes"
10+
"crypto/fips140"
1011
_ "embed"
1112
"fmt"
1213
"runtime"
@@ -168,6 +169,10 @@ func (b Info) Long() string {
168169
fmt.Fprintf(tw, "C Compiler: %s\n", b.CgoCompiler)
169170
fmt.Fprintf(tw, "Build Commit ID: %s\n", b.Revision)
170171
fmt.Fprintf(tw, "Build Type: %s\n", b.Type)
172+
if fips140.Enabled() {
173+
fmt.Fprintf(tw, "FIPS enabled: true\n")
174+
}
175+
171176
fmt.Fprintf(tw, "Enabled Assertions: %t", b.EnabledAssertions) // No final newline: cobra prints one for us.
172177
_ = tw.Flush()
173178
return buf.String()

pkg/kv/kvserver/allocator/mmaprototype/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ go_library(
66
"allocator.go",
77
"allocator_state.go",
88
"cluster_state.go",
9+
"cluster_state_rebalance_stores.go",
910
"constraint.go",
1011
"constraint_matcher.go",
1112
"doc.go",

0 commit comments

Comments
 (0)