astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-19 12:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge() should merge and return a copy (#11714)

Browse Source 
fixes #11713
This commit is contained in:
Harshavardhana
2021-03-05 09:42:46 -08:00
committed by GitHub
parent 124816f6a6
commit 651487507a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/madmin/info-commands.go
+4 -3
View File
@@ -97,14 +97,15 @@ func (d1 BackendDisks) Merge(d2 BackendDisks) BackendDisks {
if len(d2) == 0 { if len(d2) == 0 {
d2 = make(BackendDisks) d2 = make(BackendDisks)
} }
var merged = make(BackendDisks)
for i1, v1 := range d1 { for i1, v1 := range d1 {
if v2, ok := d2[i1]; ok { if v2, ok := d2[i1]; ok {
d2[i1] = v2 + v1 merged[i1] = v2 + v1
continue continue
} }
d2[i1] = v1 merged[i1] = v1
} }
return d2 return merged
} }
// StorageInfo - Connect to a minio server and call Storage Info Management API // StorageInfo - Connect to a minio server and call Storage Info Management API