test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-12-03 04:19:18 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fix sessionutil log always datanode (#17184)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2022-05-24 16:05:59 +08:00 committed by GitHub
parent d05c24a0ff
commit a0cef3a0a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/util/sessionutil/session_util.go
View File

@ -197,7 +197,7 @@ func (s *Session) getServerIDWithKey(key string) (int64, error) {
// it is false. Otherwise, set it to true. // it is false. Otherwise, set it to true.
func (s *Session) registerService() (<-chan *clientv3.LeaseKeepAliveResponse, error) { func (s *Session) registerService() (<-chan *clientv3.LeaseKeepAliveResponse, error) {
var ch <-chan *clientv3.LeaseKeepAliveResponse var ch <-chan *clientv3.LeaseKeepAliveResponse
log.Debug("DataNode begin to register to etcd", zap.String("serverName", s.ServerName)) log.Debug("service begin to register to etcd", zap.String("serverName", s.ServerName), zap.Int64("ServerID", s.ServerID))
registerFn := func() error { registerFn := func() error {
resp, err := s.etcdCli.Grant(s.ctx, DefaultTTL) resp, err := s.etcdCli.Grant(s.ctx, DefaultTTL)
if err != nil { if err != nil {
@ -213,7 +213,7 @@ func (s *Session) registerService() (<-chan *clientv3.LeaseKeepAliveResponse, er
key := s.ServerName key := s.ServerName
if !s.Exclusive { if !s.Exclusive {
key = key + "-" + strconv.FormatInt(s.ServerID, 10) key = fmt.Sprintf("%s-%d", key, s.ServerID)
} }
txnResp, err := s.etcdCli.Txn(s.ctx).If( txnResp, err := s.etcdCli.Txn(s.ctx).If(
clientv3.Compare( clientv3.Compare(
@ -238,7 +238,7 @@ func (s *Session) registerService() (<-chan *clientv3.LeaseKeepAliveResponse, er
fmt.Printf("got error during keeping alive with etcd, err: %s\n", err) fmt.Printf("got error during keeping alive with etcd, err: %s\n", err)
return err return err
} }
log.Info("DataNode registered successfully", zap.Int64("serverID", s.ServerID)) log.Info("Service registered successfully", zap.String("ServerName", s.ServerName), zap.Int64("serverID", s.ServerID))
return nil return nil
} }
err := retry.Do(s.ctx, registerFn, retry.Attempts(DefaultRetryTimes)) err := retry.Do(s.ctx, registerFn, retry.Attempts(DefaultRetryTimes))