From 756f3c8142ae952db17bb79dae23d0213d1b2e6c Mon Sep 17 00:00:00 2001 From: jiuker <2818723467@qq.com> Date: Thu, 18 Sep 2025 19:47:48 +0800 Subject: [PATCH] fix: incorrect poolID when after decommission adding pools (#21590) --- cmd/erasure-server-pool-decom.go | 1 + internal/config/identity/ldap/config.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/erasure-server-pool-decom.go b/cmd/erasure-server-pool-decom.go index 5062fb371..ab2f011d5 100644 --- a/cmd/erasure-server-pool-decom.go +++ b/cmd/erasure-server-pool-decom.go @@ -568,6 +568,7 @@ func newPoolMeta(z *erasureServerPools, prevMeta poolMeta) poolMeta { for _, currentPool := range prevMeta.Pools { // Preserve any current pool status. if currentPool.CmdLine == pool.endpoints.CmdLine { + currentPool.ID = idx newMeta.Pools = append(newMeta.Pools, currentPool) skip = true break diff --git a/internal/config/identity/ldap/config.go b/internal/config/identity/ldap/config.go index 48186b2f4..79bcf86a7 100644 --- a/internal/config/identity/ldap/config.go +++ b/internal/config/identity/ldap/config.go @@ -197,7 +197,7 @@ func Lookup(s config.Config, rootCAs *x509.CertPool) (l Config, err error) { if err != nil { host = ldapServer } - + l.LDAP = ldap.Config{ ServerAddr: ldapServer, SRVRecordName: getCfgVal(SRVRecordName),