From 9a2c91d32686728b4e3dcbcc22a6f7af68a7bf68 Mon Sep 17 00:00:00 2001
From: "zhenshan.cao" <zhenshan.cao@zilliz.com>
Date: Fri, 24 Dec 2021 22:22:17 +0800
Subject: [PATCH] Fix bug: refresh config after session init (#14194)

Signed-off-by: zhenshan.cao <zhenshan.cao@zilliz.com>
---
 internal/datanode/data_node.go           |  5 +----
 internal/proxy/proxy.go                  |  3 +--
 internal/querynode/query_node.go         |  4 +---
 internal/util/paramtable/global_param.go | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go
index 6ffa3e8ca2..e72757add3 100644
--- a/internal/datanode/data_node.go
+++ b/internal/datanode/data_node.go
@@ -209,11 +209,8 @@ func (node *DataNode) Init() error {
 		log.Error("DataNode init session failed", zap.Error(err))
 		return err
 	}
+	Params.DataNodeCfg.Refresh()
 
-	// TODO: caiyd need check
-	//Params.initMsgChannelSubName()
-	//TODO reset
-	//Params.initLogCfg()
 	log.Debug("DataNode Init",
 		zap.String("MsgChannelSubName", Params.DataNodeCfg.MsgChannelSubName),
 	)
diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
index c1503fddc1..b81ee87442 100644
--- a/internal/proxy/proxy.go
+++ b/internal/proxy/proxy.go
@@ -142,8 +142,7 @@ func (node *Proxy) Init() error {
 		log.Error("Proxy init session failed", zap.Error(err))
 		return err
 	}
-	// TODO: caiyd need check
-	//Params.initProxySubName()
+	Params.ProxyCfg.Refresh()
 	// wait for datacoord state changed to Healthy
 	if node.dataCoord != nil {
 		log.Debug("Proxy wait for DataCoord ready")
diff --git a/internal/querynode/query_node.go b/internal/querynode/query_node.go
index 3bf36ac6fb..4d2dc9e91d 100644
--- a/internal/querynode/query_node.go
+++ b/internal/querynode/query_node.go
@@ -186,6 +186,7 @@ func (node *QueryNode) Init() error {
 			initError = err
 			return
 		}
+		Params.QueryNodeCfg.Refresh()
 		connectEtcdFn := func() error {
 			etcdKV, err := etcdkv.NewEtcdKV(Params.QueryNodeCfg.EtcdEndpoints, Params.QueryNodeCfg.MetaRootPath)
 			if err != nil {
@@ -253,9 +254,6 @@ func (node *QueryNode) Init() error {
 			zap.Any("IP", Params.QueryNodeCfg.QueryNodeIP),
 			zap.Any("Port", Params.QueryNodeCfg.QueryNodePort),
 		)
-		// This param needs valid QueryNodeID
-		//Params.initMsgChannelSubName()
-		// TODO: caiyd need check
 	})
 
 	return initError
diff --git a/internal/util/paramtable/global_param.go b/internal/util/paramtable/global_param.go
index f6dd706819..3ba681fe07 100644
--- a/internal/util/paramtable/global_param.go
+++ b/internal/util/paramtable/global_param.go
@@ -541,6 +541,11 @@ func (p *proxyConfig) init(bp *BaseParamTable) {
 	//p.initRoleName()
 }
 
+// Refresh is called after session init
+func (p *proxyConfig) Refresh() {
+	p.initProxySubName()
+}
+
 // InitAlias initialize Alias member.
 func (p *proxyConfig) InitAlias(alias string) {
 	p.Alias = alias
@@ -1101,6 +1106,11 @@ func (p *queryNodeConfig) InitAlias(alias string) {
 	p.Alias = alias
 }
 
+// Refresh is called after session init
+func (p *queryNodeConfig) Refresh() {
+	p.initMsgChannelSubName()
+}
+
 func (p *queryNodeConfig) initCacheSize() {
 	defer log.Debug("init cacheSize", zap.Any("cacheSize (GB)", p.CacheSize))
 
@@ -1725,6 +1735,11 @@ func (p *dataNodeConfig) init(bp *BaseParamTable) {
 	//p.initRoleName()
 }
 
+// Refresh is called after session init
+func (p *dataNodeConfig) Refresh() {
+	p.initMsgChannelSubName()
+}
+
 // InitAlias init this DataNode alias
 func (p *dataNodeConfig) InitAlias(alias string) {
 	p.Alias = alias