Skip to content

Commit 6aee063

Browse files
alex-aizmanalex-aizman
committed
xreg: quiet-and-brief option; up modules
* (get-batch is maybe quiet but definitely not brief) Signed-off-by: Alex Aizman <alex.aizman@gmail.com>
1 parent 5cebc74 commit 6aee063

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎cmd/cli/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/NVIDIA/aistore/cmd/cli
33
go 1.25
44

55
require (
6-
github.com/NVIDIA/aistore v1.4.1-0.20251114213608-0e9d58859251
6+
github.com/NVIDIA/aistore v1.4.1-0.20251114213816-8a503c58774f
77
github.com/fatih/color v1.18.0
88
github.com/json-iterator/go v1.1.12
99
github.com/onsi/ginkgo/v2 v2.26.0

‎cmd/cli/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
22
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
33
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
4-
github.com/NVIDIA/aistore v1.4.1-0.20251114213608-0e9d58859251 h1:tuD1Gf7PyAdSHQjH0lNXPLaSENSAlKByyPMkWZP97X0=
5-
github.com/NVIDIA/aistore v1.4.1-0.20251114213608-0e9d58859251/go.mod h1:yLrdsYOGIHhoDJ48goDaS1E12b/i6KK8RwSZiDeqWog=
4+
github.com/NVIDIA/aistore v1.4.1-0.20251114213816-8a503c58774f h1:CUktKOPmH6ByC38LM2RCMG2i4MJcv70+3U25XR85l8w=
5+
github.com/NVIDIA/aistore v1.4.1-0.20251114213816-8a503c58774f/go.mod h1:yLrdsYOGIHhoDJ48goDaS1E12b/i6KK8RwSZiDeqWog=
66
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
77
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
88
github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=

‎cmd/ishard/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/NVIDIA/aistore/cmd/ishard
33
go 1.25
44

55
require (
6-
github.com/NVIDIA/aistore v1.4.1-0.20251108215617-6cc98a222a02
6+
github.com/NVIDIA/aistore v1.4.1-0.20251114213816-8a503c58774f
77
github.com/json-iterator/go v1.1.12
88
github.com/vbauerster/mpb/v4 v4.12.2
99
)

‎cmd/ishard/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
22
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
3-
github.com/NVIDIA/aistore v1.4.1-0.20251108215617-6cc98a222a02 h1:8DVo8oiZ+z/j2tK/0YO8nWA2m+i1Prxn+XbLZACo0KA=
4-
github.com/NVIDIA/aistore v1.4.1-0.20251108215617-6cc98a222a02/go.mod h1:+lmRm0p5uEVUZ5KCGwneVKIEu3LiBV7hzId6Rmc0F+M=
3+
github.com/NVIDIA/aistore v1.4.1-0.20251114213816-8a503c58774f h1:CUktKOPmH6ByC38LM2RCMG2i4MJcv70+3U25XR85l8w=
4+
github.com/NVIDIA/aistore v1.4.1-0.20251114213816-8a503c58774f/go.mod h1:yLrdsYOGIHhoDJ48goDaS1E12b/i6KK8RwSZiDeqWog=
55
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
66
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
77
github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=

‎xact/api.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ type (
111111
// (see related: `Snap.Ext` in core/xaction.go)
112112
ExtendedStats bool
113113

114-
// suppress verbose per-state log records and marks the kind
115-
// as low-value for registry history retention
116-
LogLess bool
114+
// suppress verbose per-state log records and keep only hk.OldAgeXshort (1m)
115+
// in registry history
116+
QuietBrief bool
117117
}
118118
)
119119

@@ -276,9 +276,9 @@ var Table = map[string]Descriptor{
276276
AbortRebRes: true,
277277
},
278278

279-
apc.ActList: {Scope: ScopeB, Access: apc.AceObjLIST, Startable: false, Metasync: false, Idles: true, LogLess: true},
279+
apc.ActList: {Scope: ScopeB, Access: apc.AceObjLIST, Startable: false, Metasync: false, Idles: true, QuietBrief: true},
280280

281-
apc.ActGetBatch: {Scope: ScopeGB, Startable: false, Metasync: false, ConflictRebRes: true, Idles: true, LogLess: true}, // apc.Moss
281+
apc.ActGetBatch: {Scope: ScopeGB, Startable: false, Metasync: false, ConflictRebRes: true, Idles: true}, // apc.Moss
282282

283283
// cache management, internal usage
284284
apc.ActLoadLomCache: {DisplayName: "warm-up-metadata", Scope: ScopeB, Startable: true},

‎xact/base.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (xctn *Base) Abort(err error) bool {
177177
close(xctn.abort.ch)
178178
}
179179

180-
if !Table[xctn.kind].LogLess {
180+
if !Table[xctn.kind].QuietBrief {
181181
nlog.InfoDepth(1, xctn.Name(), err)
182182
}
183183
return true
@@ -218,9 +218,9 @@ func (xctn *Base) Finish() {
218218
switch {
219219
case err == nil:
220220
debug.Assert(n == 0, n)
221-
nlog.Infoln(xname, "finished") // TODO: consider skipping LogLess as well
221+
nlog.Infoln(xname, "finished") // TODO: consider skipping QuietBrief as well
222222
return
223-
case Table[xctn.kind].LogLess:
223+
case Table[xctn.kind].QuietBrief:
224224
// skip
225225
case aborted:
226226
nlog.Warningln(xname, "aborted:", err)

‎xact/xreg/vars.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var (
1414
MyTime atomic.Int64
1515
)
1616

17-
// infrequent log when not adding (LogLess) xaction to xreg history
17+
// infrequent log when not adding (QuietBrief) xaction to xreg history
1818
var skipXregHst atomic.Int64
1919

2020
const skipXregHstCnt = 100

‎xact/xreg/xreg.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ func (r *registry) hkDelOld(int64) time.Duration {
463463
// first, cleanup (x-lso, x-moss): walk older to newer while counting the other kinds
464464
for i := range l {
465465
xctn := r.entries.all[i].Get()
466-
if !xact.Table[xctn.Kind()].LogLess {
466+
if !xact.Table[xctn.Kind()].QuietBrief {
467467
numKeepMore++
468468
continue
469469
}
@@ -479,7 +479,7 @@ func (r *registry) hkDelOld(int64) time.Duration {
479479
var cnt int
480480
for i := range l {
481481
xctn := r.entries.all[i].Get()
482-
if xact.Table[xctn.Kind()].LogLess {
482+
if xact.Table[xctn.Kind()].QuietBrief {
483483
continue
484484
}
485485
if xctn.IsDone() {
@@ -626,13 +626,13 @@ func (e *entries) del(id string) {
626626
}
627627

628628
// is called under lock
629-
// history control for LogLess kinds (x-lso, x-moss)
629+
// history control for QuietBrief kinds (x-lso, x-moss)
630630
// – keep up to 1 024 finished records
631631
// – anything beyond is silently dropped
632632
func (e *entries) _add(entry Renewable) {
633633
e.active = append(e.active, entry)
634634

635-
if l := len(e.all); xact.Table[entry.Kind()].LogLess && l >= keepOldThreshold {
635+
if l := len(e.all); xact.Table[entry.Kind()].QuietBrief && l >= keepOldThreshold {
636636
if n := skipXregHst.Inc(); n%skipXregHstCnt == 1 {
637637
nlog.Warningln("num entries in xreg history:", l, "exceeds the cap:", keepOldThreshold,
638638
"- not adding:", xact.Cname(entry.Kind(), entry.UUID()))

0 commit comments

Comments
 (0)