Skip to content

Commit 69cd6e4

Browse files
committed
mmaprototype: move storeLoadSummary to its own file
1 parent b9994d0 commit 69cd6e4

File tree

3 files changed

+32
-23
lines changed

3 files changed

+32
-23
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ go_library(
1313
"memo_helper.go",
1414
"messages.go",
1515
"rebalance_advisor.go",
16+
"store_load_summary.go",
1617
"store_set.go",
1718
"top_k_replicas.go",
1819
],

pkg/kv/kvserver/allocator/mmaprototype/load.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,6 @@ type meanNodeLoad struct {
191191
utilCPU float64
192192
}
193193

194-
type storeLoadSummary struct {
195-
worstDim LoadDimension // for logging only
196-
sls loadSummary
197-
nls loadSummary
198-
dimSummary [NumLoadDimensions]loadSummary
199-
highDiskSpaceUtilization bool
200-
maxFractionPendingIncrease, maxFractionPendingDecrease float64
201-
202-
loadSeqNum uint64
203-
}
204-
205-
func (sls storeLoadSummary) String() string {
206-
return redact.StringWithoutMarkers(sls)
207-
}
208-
209-
func (sls storeLoadSummary) SafeFormat(w redact.SafePrinter, _ rune) {
210-
w.Printf("(store=%v worst=%v cpu=%v writes=%v bytes=%v node=%v high_disk=%v frac_pending=%.2f,%.2f(%t))",
211-
sls.sls, sls.worstDim, sls.dimSummary[CPURate], sls.dimSummary[WriteBandwidth], sls.dimSummary[ByteSize],
212-
sls.nls, sls.highDiskSpaceUtilization, sls.maxFractionPendingIncrease,
213-
sls.maxFractionPendingDecrease,
214-
sls.maxFractionPendingIncrease < epsilon && sls.maxFractionPendingDecrease < epsilon)
215-
}
216-
217194
// The allocator often needs mean load information for a set of stores. This
218195
// set is implied by a constraintsDisj. We also want to know the set of stores
219196
// that satisfy that contraintsDisj. meansForStoreSet encapsulates all of this
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright 2025 The Cockroach Authors.
2+
//
3+
// Use of this software is governed by the CockroachDB Software License
4+
// included in the /LICENSE file.
5+
6+
package mmaprototype
7+
8+
import "github.com/cockroachdb/redact"
9+
10+
type storeLoadSummary struct {
11+
worstDim LoadDimension // for logging only
12+
sls loadSummary
13+
nls loadSummary
14+
dimSummary [NumLoadDimensions]loadSummary
15+
highDiskSpaceUtilization bool
16+
maxFractionPendingIncrease, maxFractionPendingDecrease float64
17+
18+
loadSeqNum uint64
19+
}
20+
21+
func (sls storeLoadSummary) String() string {
22+
return redact.StringWithoutMarkers(sls)
23+
}
24+
25+
func (sls storeLoadSummary) SafeFormat(w redact.SafePrinter, _ rune) {
26+
w.Printf("(store=%v worst=%v cpu=%v writes=%v bytes=%v node=%v high_disk=%v frac_pending=%.2f,%.2f(%t))",
27+
sls.sls, sls.worstDim, sls.dimSummary[CPURate], sls.dimSummary[WriteBandwidth], sls.dimSummary[ByteSize],
28+
sls.nls, sls.highDiskSpaceUtilization, sls.maxFractionPendingIncrease,
29+
sls.maxFractionPendingDecrease,
30+
sls.maxFractionPendingIncrease < epsilon && sls.maxFractionPendingDecrease < epsilon)
31+
}

0 commit comments

Comments
 (0)