blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-09-04 22:53:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): select discovery backend from configured type (#3772)

Browse Source 
* refactor(core): select discovery backend from configured type

* refactor(core): select discovery backend from configured type

* fix(core): restore discovery register API compatibility

* chore: remove local tooling entries from gitignore
This commit is contained in:
dsx137 2026-07-22 15:46:48 +08:00 committed by GitHub
parent 62a45fb302
commit b516996cbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -387,4 +387,4 @@ Sessionx.vim
# End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains # End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
.idea .idea
dist/ dist/

28
pkg/common/discoveryregister/discoveryregister.go
View File

@ -15,32 +15,40 @@
package discoveryregister package discoveryregister
import ( import (
"strings"
"time" "time"
"google.golang.org/grpc"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/discovery"
"github.com/openimsdk/tools/discovery/etcd" "github.com/openimsdk/tools/discovery/etcd"
"github.com/openimsdk/tools/discovery/kubernetes" "github.com/openimsdk/tools/discovery/kubernetes"
"github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/errs"
"github.com/openimsdk/tools/utils/runtimeenv" "github.com/openimsdk/tools/utils/runtimeenv"
"google.golang.org/grpc"
) )
// NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type. // NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type.
func NewDiscoveryRegister(discovery *config.Discovery, share *config.Share, watchNames []string) (discovery.SvcDiscoveryRegistry, error) { func NewDiscoveryRegister(discovery *config.Discovery, share *config.Share, watchNames []string) (discovery.SvcDiscoveryRegistry, error) {
if runtimeenv.RuntimeEnvironment() == config.KUBERNETES { runtimeEnvironment := runtimeenv.RuntimeEnvironment()
namespace := discovery.Kubernetes.Namespace discoveryType := discovery.Enable
if namespace == "" { if discoveryType == "" && runtimeEnvironment == config.KUBERNETES {
namespace = "default" discoveryType = config.KUBERNETES
}
if discoveryType == config.KUBERNETES && runtimeEnvironment != config.KUBERNETES {
return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
}
switch discoveryType {
case config.KUBERNETES:
for i := range watchNames {
watchNames[i] = strings.Split(watchNames[i], ":")[0]
} }
return kubernetes.NewConnManager(namespace, watchNames, return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, watchNames,
grpc.WithDefaultCallOptions( grpc.WithDefaultCallOptions(
grpc.MaxCallSendMsgSize(1024*1024*20), grpc.MaxCallSendMsgSize(1024*1024*20),
), ),
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
) )
}
switch discovery.Enable {
case config.ETCD: case config.ETCD:
return etcd.NewSvcDiscoveryRegistry( return etcd.NewSvcDiscoveryRegistry(
discovery.Etcd.RootDirectory, discovery.Etcd.RootDirectory,
@ -50,6 +58,6 @@ func NewDiscoveryRegister(discovery *config.Discovery, share *config.Share, watc
etcd.WithMaxCallSendMsgSize(20*1024*1024), etcd.WithMaxCallSendMsgSize(20*1024*1024),
etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password)) etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password))
default: default:
return nil, errs.New("unsupported discovery type", "type", discovery.Enable).Wrap() return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
} }
} }