admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-02-02 01:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
issue: #31219
pr: #31596

Signed-off-by: jaime <yun.zhang@zilliz.com>
This commit is contained in:
jaime 2024-03-26 11:45:09 +08:00 committed by GitHub
parent a6fe96f20a
commit 8713765f4d
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

@ -419,8 +419,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))
@ -444,8 +442,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()
}
@ -470,6 +466,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)