feat: Add enable config center button && fix: grpc connection leakage (#3036)

* feat: add enable config center

* fix: config

* fix: config

* fix: config

* fix: config

pkg/common/cmd/auth.go

@@ -64,5 +64,8 @@ func (a *AuthRpcCmd) runE() error {
 			a.authConfig.RedisConfig.GetConfigFileName(),
 			a.authConfig.Discovery.GetConfigFileName(),
 		},
+		[]string{
+			a.authConfig.Discovery.RpcService.MessageGateway,
+		},
 		auth.Start)
 }

pkg/common/cmd/conversation.go

@@ -68,6 +68,6 @@ func (a *ConversationRpcCmd) runE() error {
 			a.conversationConfig.Share.GetConfigFileName(),
 			a.conversationConfig.LocalCacheConfig.GetConfigFileName(),
 			a.conversationConfig.Discovery.GetConfigFileName(),
-		},
+		}, nil,
 		conversation.Start)
 }

pkg/common/cmd/friend.go

@@ -70,6 +70,6 @@ func (a *FriendRpcCmd) runE() error {
 			a.relationConfig.WebhooksConfig.GetConfigFileName(),
 			a.relationConfig.LocalCacheConfig.GetConfigFileName(),
 			a.relationConfig.Discovery.GetConfigFileName(),
-		},
+		}, nil,
 		relation.Start)
 }

pkg/common/cmd/group.go

@@ -71,6 +71,6 @@ func (a *GroupRpcCmd) runE() error {
 			a.groupConfig.WebhooksConfig.GetConfigFileName(),
 			a.groupConfig.LocalCacheConfig.GetConfigFileName(),
 			a.groupConfig.Discovery.GetConfigFileName(),
-		},
+		}, nil,
 		group.Start, versionctx.EnableVersionCtx())
 }

pkg/common/cmd/msg.go

@@ -72,6 +72,6 @@ func (a *MsgRpcCmd) runE() error {
 			a.msgConfig.WebhooksConfig.GetConfigFileName(),
 			a.msgConfig.LocalCacheConfig.GetConfigFileName(),
 			a.msgConfig.Discovery.GetConfigFileName(),
-		},
+		}, nil,
 		msg.Start)
 }

pkg/common/cmd/push.go

@@ -72,5 +72,8 @@ func (a *PushRpcCmd) runE() error {
 			a.pushConfig.LocalCacheConfig.GetConfigFileName(),
 			a.pushConfig.Discovery.GetConfigFileName(),
 		},
+		[]string{
+			a.pushConfig.Discovery.RpcService.MessageGateway,
+		},
 		push.Start)
 }

pkg/common/cmd/root.go

@@ -93,7 +93,7 @@ func (r *RootCmd) initEtcd() error {
 		return err
 	}
 	if disConfig.Enable == config.ETCD {
-		discov, _ := kdisc.NewDiscoveryRegister(&disConfig, env)
+		discov, _ := kdisc.NewDiscoveryRegister(&disConfig, env, nil)
 		r.etcdClient = discov.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
 	}
 	return nil
@@ -113,7 +113,9 @@ func (r *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) e
 	if err := r.initializeLogger(cmdOpts); err != nil {
 		return errs.WrapMsg(err, "failed to initialize logger")
 	}
-
+	if err := r.etcdClient.Close(); err != nil {
+		return errs.WrapMsg(err, "failed to close etcd client")
+	}
 	return nil
 }
 
@@ -141,9 +143,24 @@ func (r *RootCmd) updateConfigFromEtcd(opts *CmdOpts) error {
 	if r.etcdClient == nil {
 		return nil
 	}
+	ctx := context.TODO()
+
+	res, err := r.etcdClient.Get(ctx, disetcd.BuildKey(disetcd.EnableConfigCenterKey))
+	if err != nil {
+		log.ZWarn(ctx, "root cmd updateConfigFromEtcd, etcd Get EnableConfigCenterKey err: %v", errs.Wrap(err))
+		return nil
+	}
+	if res.Count == 0 {
+		return nil
+	} else {
+		if string(res.Kvs[0].Value) == disetcd.Disable {
+			return nil
+		} else if string(res.Kvs[0].Value) != disetcd.Enable {
+			return errs.New("unknown EnableConfigCenter value").Wrap()
+		}
+	}
 
 	update := func(configFileName string, configStruct any) error {
-		ctx := context.TODO()
 		key := disetcd.BuildKey(configFileName)
 		etcdRes, err := r.etcdClient.Get(ctx, key)
 		if err != nil {

pkg/common/cmd/third.go

@@ -70,6 +70,6 @@ func (a *ThirdRpcCmd) runE() error {
 			a.thirdConfig.MinioConfig.GetConfigFileName(),
 			a.thirdConfig.LocalCacheConfig.GetConfigFileName(),
 			a.thirdConfig.Discovery.GetConfigFileName(),
-		},
+		}, nil,
 		third.Start)
 }

pkg/common/cmd/user.go

@@ -72,6 +72,6 @@ func (a *UserRpcCmd) runE() error {
 			a.userConfig.WebhooksConfig.GetConfigFileName(),
 			a.userConfig.LocalCacheConfig.GetConfigFileName(),
 			a.userConfig.Discovery.GetConfigFileName(),
-		},
+		}, nil,
 		user.Start)
 }

pkg/common/discovery/discoveryregister.go

@@ -28,7 +28,7 @@ import (
 )
 
 // NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type.
-func NewDiscoveryRegister(discovery *config.Discovery, runtimeEnv string) (discovery.SvcDiscoveryRegistry, error) {
+func NewDiscoveryRegister(discovery *config.Discovery, runtimeEnv string, watchNames []string) (discovery.SvcDiscoveryRegistry, error) {
 	if runtimeEnv == config.KUBERNETES {
 		return kubernetes.NewKubernetesConnManager(discovery.Kubernetes.Namespace,
 			grpc.WithDefaultCallOptions(
@@ -42,6 +42,7 @@ func NewDiscoveryRegister(discovery *config.Discovery, runtimeEnv string) (disco
 		return etcd.NewSvcDiscoveryRegistry(
 			discovery.Etcd.RootDirectory,
 			discovery.Etcd.Address,
+			watchNames,
 			etcd.WithDialTimeout(10*time.Second),
 			etcd.WithMaxCallSendMsgSize(20*1024*1024),
 			etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password))

pkg/common/discovery/etcd/config_manager.go

@@ -14,11 +14,6 @@ import (
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
-const (
-	ConfigKeyPrefix = "/open-im/config/"
-	RestartKey      = "restart"
-)
-
 var (
 	ShutDowns []func() error
 )

pkg/common/discovery/etcd/const.go

@@ -0,0 +1,9 @@
+package etcd
+
+const (
+	ConfigKeyPrefix       = "/open-im/config/"
+	RestartKey            = "restart"
+	EnableConfigCenterKey = "enable-config-center"
+	Enable                = "enable"
+	Disable               = "disable"
+)

pkg/common/discovery/etcd/doc.go

@@ -1,15 +0,0 @@
-// Copyright © 2024 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcd // import "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"

pkg/common/startrpc/start.go

@@ -49,7 +49,7 @@ import (
 // Start rpc server.
 func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConfig *conf.Prometheus, listenIP,
 	registerIP string, autoSetPorts bool, rpcPorts []int, index int, rpcRegisterName string, notification *conf.Notification, config T,
-	watchConfigNames []string,
+	watchConfigNames []string, watchServiceNames []string,
 	rpcFn func(ctx context.Context, config T, client discovery.SvcDiscoveryRegistry, server *grpc.Server) error,
 	options ...grpc.ServerOption) error {
 
@@ -95,7 +95,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 	if autoSetPorts && discovery.Enable != conf.ETCD {
 		return errs.New("only etcd support autoSetPorts", "rpcRegisterName", rpcRegisterName).Wrap()
 	}
-	client, err := kdisc.NewDiscoveryRegister(discovery, runTimeEnv)
+	client, err := kdisc.NewDiscoveryRegister(discovery, runTimeEnv, watchServiceNames)
 	if err != nil {
 		return err
 	}