mirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-09-22 06:01:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: incorrect poolID when after decommission adding pools (#21590)
Some checks failed
VulnCheck / Analysis (push) Has been cancelled
Details
Lock Threads / action (push) Has been cancelled
Details

Browse Source
This commit is contained in:
jiuker 2025-09-18 19:47:48 +08:00 committed by GitHub
parent 7a80ec1cce
commit 756f3c8142
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/erasure-server-pool-decom.go
View File

@ -568,6 +568,7 @@ func newPoolMeta(z *erasureServerPools, prevMeta poolMeta) poolMeta {
for _, currentPool := range prevMeta.Pools { for _, currentPool := range prevMeta.Pools {
// Preserve any current pool status. // Preserve any current pool status.
if currentPool.CmdLine == pool.endpoints.CmdLine { if currentPool.CmdLine == pool.endpoints.CmdLine {
currentPool.ID = idx
newMeta.Pools = append(newMeta.Pools, currentPool) newMeta.Pools = append(newMeta.Pools, currentPool)
skip = true skip = true
break break

2
internal/config/identity/ldap/config.go
View File

@ -197,7 +197,7 @@ func Lookup(s config.Config, rootCAs *x509.CertPool) (l Config, err error) {
if err != nil { if err != nil {
host = ldapServer host = ldapServer
} }
l.LDAP = ldap.Config{ l.LDAP = ldap.Config{
ServerAddr: ldapServer, ServerAddr: ldapServer,
SRVRecordName: getCfgVal(SRVRecordName), SRVRecordName: getCfgVal(SRVRecordName),