milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: proxy ctx cancel before revoking session (#31611) 

issue: https://github.com/milvus-io/milvus/issues/31219
pr: https://github.com/milvus-io/milvus/pull/31596

Signed-off-by: jaime <yun.zhang@zilliz.com>
pull/31787/head
jaime 2024-04-01 15:37:13 +08:00 committed by GitHub
parent be834638d3
commit 4f3bfe24a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/proxy/proxy.go
View File

@ -421,8 +421,6 @@ func (node *Proxy) Start() error {
// Stop stops a proxy node.
func (node *Proxy) Stop() error {
node.cancel()
if node.rowIDAllocator != nil {
node.rowIDAllocator.Close()
log.Info("close id allocator", zap.String("role", typeutil.ProxyRole))
@ -446,8 +444,6 @@ func (node *Proxy) Stop() error {
log.Info("close channels time ticker", zap.String("role", typeutil.ProxyRole))
}
node.wg.Wait()
for _, cb := range node.closeCallbacks {
cb()
}
@ -472,6 +468,9 @@ func (node *Proxy) Stop() error {
node.resourceManager.Close()
}
node.cancel()
node.wg.Wait()
// https://github.com/milvus-io/milvus/issues/12282
node.UpdateStateCode(commonpb.StateCode_Abnormal)