Skip to content

Commit 182f813

Browse files
committed
Add support for catalog batch job type
- During batch yaml generation, we check if the server supports the kind of batch job requested. - Shows catalog job status
1 parent e241b01 commit 182f813

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

cmd/batch-status.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,19 @@ func (m *batchJobMetricsUI) View() string {
277277
accElapsedTime := m.metric.LastUpdate.Sub(m.metric.StartTime)
278278
addLine("Elapsed: ", accElapsedTime.String())
279279
}
280-
280+
case string(madmin.BatchJobCatalog):
281+
addLine("JobType: ", m.metric.JobType)
282+
addLine("ObjectsScannedCount: ", m.metric.Catalog.ObjectsScannedCount)
283+
addLine("ObjectsMatchedCount: ", m.metric.Catalog.ObjectsMatchedCount)
284+
lastScanned := fmt.Sprintf("%s/%s", m.metric.Catalog.LastBucketScanned, m.metric.Catalog.LastObjectScanned)
285+
addLine("LastScanned: ", lastScanned)
286+
lastMatched := fmt.Sprintf("%s/%s", m.metric.Catalog.LastBucketMatched, m.metric.Catalog.LastObjectMatched)
287+
addLine("LastMatched: ", lastMatched)
288+
accElapsedTime := m.metric.LastUpdate.Sub(m.metric.StartTime)
289+
addLine("RecordsWrittenCount: ", m.metric.Catalog.RecordsWrittenCount)
290+
addLine("OutputObjectsCount: ", m.metric.Catalog.OutputObjectsCount)
291+
addLine("Elapsed: ", accElapsedTime.Round(time.Second).String())
292+
addLine("Scan Speed: ", fmt.Sprintf("%f objects/s", float64(m.metric.Catalog.ObjectsScannedCount)/accElapsedTime.Seconds()))
281293
}
282294

283295
table.AppendBulk(data)

go.mod

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ go 1.23.0
44

55
toolchain go1.23.6
66

7+
replace github.com/minio/madmin-go/v3 => github.com/donatello/madmin-go/v3 v3.0.0-20250313224203-417a404ebce5
8+
9+
// replace github.com/minio/madmin-go/v3 => ../madmin-go
10+
711
require (
812
github.com/charmbracelet/bubbles v0.20.0
913
github.com/charmbracelet/bubbletea v1.3.4

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
3838
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3939
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
4040
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
41+
github.com/donatello/madmin-go/v3 v3.0.0-20250313224203-417a404ebce5 h1:G/O8BWwNIRmWytkvBa2E/bZr6MoM09Axpnv6AezToCk=
42+
github.com/donatello/madmin-go/v3 v3.0.0-20250313224203-417a404ebce5/go.mod h1:pMLdj9OtN0CANNs5tdm6opvOlDFfj0WhbztboZAjRWE=
4143
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
4244
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
4345
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
@@ -142,8 +144,6 @@ github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY
142144
github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
143145
github.com/minio/filepath v1.0.0 h1:fvkJu1+6X+ECRA6G3+JJETj4QeAYO9sV43I79H8ubDY=
144146
github.com/minio/filepath v1.0.0/go.mod h1:/nRZA2ldl5z6jT9/KQuvZcQlxZIMQoFFQPvEXx9T/Bw=
145-
github.com/minio/madmin-go/v3 v3.0.97 h1:P7XO+ofPexkXy9akxG9Xoif1zIkbmWKeKtG3AquVzEY=
146-
github.com/minio/madmin-go/v3 v3.0.97/go.mod h1:pMLdj9OtN0CANNs5tdm6opvOlDFfj0WhbztboZAjRWE=
147147
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
148148
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
149149
github.com/minio/minio-go/v7 v7.0.88 h1:v8MoIJjwYxOkehp+eiLIuvXk87P2raUtoU5klrAAshs=

0 commit comments

Comments
 (0)