Skip to content

Fix: Same address cannot distinguish different registry center #2784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexStocks merged 3 commits into from
Mar 1, 2025
Merged

Fix: Same address cannot distinguish different registry center #2784

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a25924
fix: Same address cannot distinguish different registry center
1kasa Feb 28, 2025
9293a3f
fix: Same address cannot distinguish different registry center
1kasa Feb 28, 2025
c349231
registry.namespace is set to a constant,
1kasa Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions registry/protocol/protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,20 @@ func newRegistryProtocol() *registryProtocol {

func (proto *registryProtocol) getRegistry(registryUrl *common.URL) registry.Registry {
var err error
reg, loaded := proto.registries.Load(registryUrl.PrimitiveURL)

namespace := registryUrl.GetParam("registry.namespace", "")
cacheKey := registryUrl.PrimitiveURL
if namespace != "" {
cacheKey = cacheKey + "?" + constant.NacosNamespaceID + "=" + namespace
}
reg, loaded := proto.registries.Load(cacheKey)
if !loaded {
reg, err = extension.GetRegistry(registryUrl.Protocol, registryUrl)
if err != nil {
logger.Errorf("Registry can not connect success, program is going to panic.Error message is %s", err.Error())
panic(err)
}
proto.registries.Store(registryUrl.PrimitiveURL, reg)
proto.registries.Store(cacheKey, reg)
}
return reg.(registry.Registry)
}
Expand Down
4 changes: 4 additions & 0 deletions remoting/nacos/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,9 @@ func NewNacosClientByURL(url *common.URL) (*nacosClient.NacosNamingClient, error
return nil, perrors.New("nacos client name must set")
}
logger.Infof("[Nacos Client] New nacos client with config = %+v", scs)
namespaceID := url.GetParam(constant.NacosNamespaceID, "")
if len(namespaceID) > 0 {
clientName += namespaceID
}
return nacosClient.NewNacosNamingClient(clientName, true, scs, cc)
}
Loading