admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestSessionSuite/TestKeepAliveRetryActiveCancel unit test logic (#27231)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2023-09-20 18:59:23 +08:00 committed by GitHub
parent 773080df24
commit 16b35e07b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -800,6 +800,7 @@ func (s *Session) LivenessCheck(ctx context.Context, callback func()) {
go func() { go func() {
defer s.wg.Done() defer s.wg.Done()
for { for {
defer s.SetDisconnected(true)
select { select {
case _, ok := <-s.liveCh: case _, ok := <-s.liveCh:
// ok, still alive // ok, still alive
@ -808,7 +809,6 @@ func (s *Session) LivenessCheck(ctx context.Context, callback func()) {
} }
// not ok, connection lost // not ok, connection lost
log.Warn("connection lost detected, shuting down") log.Warn("connection lost detected, shuting down")
s.SetDisconnected(true)
if callback != nil { if callback != nil {
go callback() go callback()
} }

8
internal/util/sessionutil/session_util_test.go
View File

@ -919,17 +919,15 @@ func (s *SessionSuite) TestKeepAliveRetryActiveCancel() {
// Register // Register
ch, err := session.registerService() ch, err := session.registerService()
if err != nil { s.Require().NoError(err)
panic(err)
}
session.liveCh = make(chan struct{}) session.liveCh = make(chan struct{})
session.processKeepAliveResponse(ch) session.processKeepAliveResponse(ch)
session.LivenessCheck(ctx, nil) session.LivenessCheck(ctx, nil)
// active cancel, should not retry connect // active cancel, should not retry connect
session.cancelKeepAlive() session.cancelKeepAlive()
// sleep a while wait goroutine process // wait workers exit
time.Sleep(time.Millisecond * 100) session.wg.Wait()
// expected Disconnected = true, means session is closed // expected Disconnected = true, means session is closed
assert.Equal(s.T(), true, session.Disconnected()) assert.Equal(s.T(), true, session.Disconnected())
} }