From 585989935a533d3e10499127fa18cfab78d6c122 Mon Sep 17 00:00:00 2001 From: Xiaofan <83447078+xiaofan-luan@users.noreply.github.com> Date: Mon, 27 Sep 2021 17:37:57 +0800 Subject: [PATCH] Revert the logger change (#8677) Signed-off-by: xiaofan-luan --- internal/datanode/data_node.go | 3 ++- internal/datanode/param_table.go | 2 ++ internal/indexnode/indexnode.go | 3 ++- internal/indexnode/param_table.go | 1 + internal/proxy/param_table.go | 2 ++ internal/proxy/proxy.go | 3 ++- internal/querycoord/param_table.go | 6 +++++- internal/querynode/param_table.go | 2 ++ internal/querynode/query_node.go | 3 ++- 9 files changed, 20 insertions(+), 5 deletions(-) diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index cb15734fdf..764b3001e6 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -157,7 +157,8 @@ func (node *DataNode) Register() error { go node.StartWatchChannels(node.ctx) Params.initMsgChannelSubName() - Params.initLogCfg() + //TODO reset + //Params.initLogCfg() log.Debug("DataNode Init", zap.String("MsgChannelSubName", Params.MsgChannelSubName), ) diff --git a/internal/datanode/param_table.go b/internal/datanode/param_table.go index 2e09e01046..290103cda6 100644 --- a/internal/datanode/param_table.go +++ b/internal/datanode/param_table.go @@ -126,6 +126,8 @@ func (p *ParamTable) Init() { p.initMinioSecretAccessKey() p.initMinioUseSSL() p.initMinioBucketName() + + p.initLogCfg() } // ==== DataNode internal components configs ==== diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go index 5e823671be..5cdb463515 100644 --- a/internal/indexnode/indexnode.go +++ b/internal/indexnode/indexnode.go @@ -106,7 +106,8 @@ func (i *IndexNode) Register() error { } i.liveCh = i.session.Init(typeutil.IndexNodeRole, Params.IP+":"+strconv.Itoa(Params.Port), false) Params.NodeID = i.session.ServerID - Params.initLogCfg() + //TODO reset logger + //Params.initLogCfg() return nil } diff --git a/internal/indexnode/param_table.go b/internal/indexnode/param_table.go index 652e66fe16..bd77e44cab 100644 --- a/internal/indexnode/param_table.go +++ b/internal/indexnode/param_table.go @@ -92,6 +92,7 @@ func (pt *ParamTable) initParams() { pt.initEtcdEndpoints() pt.initMetaRootPath() pt.initIndexRootPath() + pt.initLogCfg() } func (pt *ParamTable) initMinIOAddress() { diff --git a/internal/proxy/param_table.go b/internal/proxy/param_table.go index 8ee3e75366..515f93bb92 100644 --- a/internal/proxy/param_table.go +++ b/internal/proxy/param_table.go @@ -107,6 +107,8 @@ func (pt *ParamTable) Init() { pt.initRoleName() pt.initMaxTaskNum() + + Params.initLogCfg() } func (pt *ParamTable) InitAlias(alias string) { diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 8a5acafcb4..7310e7081d 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -100,7 +100,8 @@ func (node *Proxy) Register() error { node.session.Init(typeutil.ProxyRole, Params.NetworkAddress, false) Params.ProxyID = node.session.ServerID Params.initProxySubName() - Params.initLogCfg() + // TODO Reset the logger + //Params.initLogCfg() return nil } diff --git a/internal/querycoord/param_table.go b/internal/querycoord/param_table.go index 0537275ca3..fda68e432a 100644 --- a/internal/querycoord/param_table.go +++ b/internal/querycoord/param_table.go @@ -80,7 +80,7 @@ func (p *ParamTable) Init() { panic(err) } - p.BaseTable.InitLogCfg("queryCoord", 0) + p.initLogCfg() p.initQueryCoordAddress() p.initRoleName() @@ -237,3 +237,7 @@ func (p *ParamTable) initMinioBucketName() { } p.MinioBucketName = bucketName } + +func (p *ParamTable) initLogCfg() { + p.InitLogCfg("querycoord", 0) +} diff --git a/internal/querynode/param_table.go b/internal/querynode/param_table.go index c21f3097da..7bc42df76e 100644 --- a/internal/querynode/param_table.go +++ b/internal/querynode/param_table.go @@ -126,6 +126,8 @@ func (p *ParamTable) Init() { p.initSegcoreChunkRows() p.initKnowhereSimdType() + + p.initLogCfg() } // ---------------------------------------------------------- minio diff --git a/internal/querynode/query_node.go b/internal/querynode/query_node.go index 9b93629d3b..f4eca07cdf 100644 --- a/internal/querynode/query_node.go +++ b/internal/querynode/query_node.go @@ -109,7 +109,8 @@ func (node *QueryNode) Register() error { // This param needs valid QueryNodeID Params.initMsgChannelSubName() - Params.initLogCfg() + //TODO Reset the logger + //Params.initLogCfg() return nil }