Skip to content

Commit 2ac950f

Browse files
committed
Reuse GetClusterRegInfo from mc
1 parent 4ce1ba9 commit 2ac950f

File tree

3 files changed

+8
-43
lines changed

3 files changed

+8
-43
lines changed

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/minio/cli v1.24.2
2222
github.com/minio/highwayhash v1.0.2
2323
github.com/minio/kes v0.23.0
24-
github.com/minio/madmin-go/v3 v3.0.49
24+
github.com/minio/madmin-go/v3 v3.0.50-0.20240307075442-63b4fc3ac1fd
2525
github.com/minio/mc v0.0.0-20240309064306-1ec55a5178d7
2626
github.com/minio/minio-go/v7 v7.0.69
2727
github.com/minio/selfupdate v0.6.0
@@ -155,3 +155,5 @@ require (
155155
gopkg.in/ini.v1 v1.67.0 // indirect
156156
gopkg.in/yaml.v3 v3.0.1 // indirect
157157
)
158+
159+
replace github.com/minio/mc => github.com/anjalshireesh/mc v0.0.0-20240319134657-0e1592c105d9

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1o
88
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
99
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
1010
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
11+
github.com/anjalshireesh/mc v0.0.0-20240319134657-0e1592c105d9 h1:I9LGUXAZQUSJ1K3gwFNuRaMwUlJWcXxdbXoeupppNds=
12+
github.com/anjalshireesh/mc v0.0.0-20240319134657-0e1592c105d9/go.mod h1:YgeY0RTYvbm/H6Gzwb+rpRsQ/XREi3NwITZUcTNATOQ=
1113
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
1214
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
1315
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
@@ -184,10 +186,8 @@ github.com/minio/kes v0.23.0 h1:T0zHtyDoI3JdKrVvzdM4xwVryYYyh5pKwNUVBoqxsNs=
184186
github.com/minio/kes v0.23.0/go.mod h1:vvXVGcgu9mYLkbVWlEvFFl6bYR196RQlOU2Q+rHApl8=
185187
github.com/minio/kes-go v0.2.1 h1:KnqS+p6xoSFJZbQhmJaz/PbxeA6nQyRqT/ywrn5lU2o=
186188
github.com/minio/kes-go v0.2.1/go.mod h1:76xf7l41Wrh+IifisABXK2S8uZWYgWV1IGBKC3GdOJk=
187-
github.com/minio/madmin-go/v3 v3.0.49 h1:Ag5eyYUf9K1MvW9hiErEJhGfqlf//pOtlhdoepb9AwY=
188-
github.com/minio/madmin-go/v3 v3.0.49/go.mod h1:ZDF7kf5fhmxLhbGTqyq5efs4ao0v4eWf7nOuef/ljJs=
189-
github.com/minio/mc v0.0.0-20240309064306-1ec55a5178d7 h1:3Lk0uBbXaJBtEzDi0quc2x3FdChHOiOQNdM0+L6OhJ8=
190-
github.com/minio/mc v0.0.0-20240309064306-1ec55a5178d7/go.mod h1:p7FcVMk9MTua2cxr1vkajPj46M1PQ5u4FQQ2UI5ZtwU=
189+
github.com/minio/madmin-go/v3 v3.0.50-0.20240307075442-63b4fc3ac1fd h1:oZycRrLgzEg4+lGZ5Tkua3BKvK7rOtDlmoOR3gq58l4=
190+
github.com/minio/madmin-go/v3 v3.0.50-0.20240307075442-63b4fc3ac1fd/go.mod h1:ZDF7kf5fhmxLhbGTqyq5efs4ao0v4eWf7nOuef/ljJs=
191191
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
192192
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
193193
github.com/minio/minio-go/v7 v7.0.69 h1:l8AnsQFyY1xiwa/DaQskY4NXSLA2yrGsW5iD9nRPVS0=

pkg/subnet/utils.go

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -204,44 +204,7 @@ func subnetPostReq(client xhttp.ClientI, reqURL string, payload interface{}, hea
204204
}
205205

206206
func GetClusterRegInfo(admInfo madmin.InfoMessage) mc.ClusterRegistrationInfo {
207-
noOfPools := 1
208-
noOfDrives := 0
209-
for _, srvr := range admInfo.Servers {
210-
if srvr.PoolNumber > noOfPools {
211-
noOfPools = srvr.PoolNumber
212-
}
213-
noOfDrives += len(srvr.Disks)
214-
}
215-
216-
totalSpace, usedSpace := getDriveSpaceInfo(admInfo)
217-
218-
return mc.ClusterRegistrationInfo{
219-
DeploymentID: admInfo.DeploymentID,
220-
ClusterName: admInfo.DeploymentID,
221-
UsedCapacity: admInfo.Usage.Size,
222-
Info: mc.ClusterInfo{
223-
MinioVersion: admInfo.Servers[0].Version,
224-
NoOfServerPools: noOfPools,
225-
NoOfServers: len(admInfo.Servers),
226-
NoOfDrives: noOfDrives,
227-
TotalDriveSpace: totalSpace,
228-
UsedDriveSpace: usedSpace,
229-
NoOfBuckets: admInfo.Buckets.Count,
230-
NoOfObjects: admInfo.Objects.Count,
231-
},
232-
}
233-
}
234-
235-
func getDriveSpaceInfo(admInfo madmin.InfoMessage) (uint64, uint64) {
236-
total := uint64(0)
237-
used := uint64(0)
238-
for _, srvr := range admInfo.Servers {
239-
for _, d := range srvr.Disks {
240-
total += d.TotalSpace
241-
used += d.UsedSpace
242-
}
243-
}
244-
return total, used
207+
return mc.GetClusterRegInfo(admInfo, admInfo.DeploymentID)
245208
}
246209

247210
func GetSubnetAPIKeyUsingLicense(lic string) (string, error) {

0 commit comments

Comments
 (0)