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

Make CollectionObserver trigger checker more frequently during load procedure (#23928)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2023-05-08 14:06:41 +08:00 committed by GitHub
parent a86332b2d7
commit ed81eaa963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/querycoordv2/checkers/controller.go
View File

@ -70,7 +70,7 @@ func NewCheckerController(
return &CheckerController{
stopCh: make(chan struct{}),
checkCh: make(chan struct{}),
checkCh: make(chan struct{}, 1),
meta: meta,
dist: dist,
targetMgr: targetMgr,
@ -112,7 +112,10 @@ func (controller *CheckerController) Stop() {
}
func (controller *CheckerController) Check() {
controller.checkCh <- struct{}{}
select {
case controller.checkCh <- struct{}{}:
default:
}
}
// check is the real implementation of Check

10
internal/querycoordv2/observers/collection_observer.go
View File

@ -24,6 +24,7 @@ import (
"go.uber.org/zap"
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/querycoordv2/checkers"
"github.com/milvus-io/milvus/internal/querycoordv2/meta"
. "github.com/milvus-io/milvus/internal/querycoordv2/params"
"github.com/milvus-io/milvus/internal/querycoordv2/utils"
@ -37,6 +38,7 @@ type CollectionObserver struct {
meta *meta.Meta
targetMgr *meta.TargetManager
targetObserver *TargetObserver
checkerController *checkers.CheckerController
partitionLoadedCount map[int64]int
stopOnce sync.Once
@ -47,6 +49,7 @@ func NewCollectionObserver(
meta *meta.Meta,
targetMgr *meta.TargetManager,
targetObserver *TargetObserver,
checherController *checkers.CheckerController,
) *CollectionObserver {
return &CollectionObserver{
stopCh: make(chan struct{}),
@ -54,6 +57,7 @@ func NewCollectionObserver(
meta: meta,
targetMgr: targetMgr,
targetObserver: targetObserver,
checkerController: checherController,
partitionLoadedCount: make(map[int64]int),
}
}
@ -135,12 +139,18 @@ func (ob *CollectionObserver) observeLoadStatus() {
if len(partitions) > 0 {
log.Info("observe partitions status", zap.Int("partitionNum", len(partitions)))
}
loading := false
for _, partition := range partitions {
if partition.LoadPercentage == 100 {
continue
}
replicaNum := ob.meta.GetReplicaNumber(partition.GetCollectionID())
ob.observePartitionLoadStatus(partition, replicaNum)
loading = true
}
// trigger check logic when loading collections/partitions
if loading {
ob.checkerController.Check()
}
}

12
internal/querycoordv2/observers/collection_observer_test.go
View File

@ -30,6 +30,7 @@ import (
etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
"github.com/milvus-io/milvus/internal/proto/datapb"
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/querycoordv2/checkers"
"github.com/milvus-io/milvus/internal/querycoordv2/meta"
. "github.com/milvus-io/milvus/internal/querycoordv2/params"
"github.com/milvus-io/milvus/internal/querycoordv2/session"
@ -58,10 +59,11 @@ type CollectionObserverSuite struct {
broker *meta.MockBroker
// Dependencies
dist *meta.DistributionManager
meta *meta.Meta
targetMgr *meta.TargetManager
targetObserver *TargetObserver
dist *meta.DistributionManager
meta *meta.Meta
targetMgr *meta.TargetManager
targetObserver *TargetObserver
checkerController *checkers.CheckerController
// Test object
ob *CollectionObserver
@ -188,6 +190,7 @@ func (suite *CollectionObserverSuite) SetupTest() {
suite.dist,
suite.broker,
)
suite.checkerController = &checkers.CheckerController{}
// Test object
suite.ob = NewCollectionObserver(
@ -195,6 +198,7 @@ func (suite *CollectionObserverSuite) SetupTest() {
suite.meta,
suite.targetMgr,
suite.targetObserver,
suite.checkerController,
)
for _, collection := range suite.collections {

1
internal/querycoordv2/server.go
View File

@ -356,6 +356,7 @@ func (s *Server) initObserver() {
s.meta,
s.targetMgr,
s.targetObserver,
s.checkerController,
)
s.replicaObserver = observers.NewReplicaObserver(

1
internal/querycoordv2/server_test.go
View File

@ -518,6 +518,7 @@ func (suite *ServerSuite) hackServer() {
suite.server.meta,
suite.server.targetMgr,
suite.server.targetObserver,
suite.server.checkerController,
)
suite.broker.EXPECT().GetCollectionSchema(mock.Anything, mock.Anything).Return(&schemapb.CollectionSchema{}, nil).Maybe()

2
internal/querycoordv2/services_test.go
View File

@ -35,6 +35,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/querycoordv2/balance"
"github.com/milvus-io/milvus/internal/querycoordv2/checkers"
"github.com/milvus-io/milvus/internal/querycoordv2/dist"
"github.com/milvus-io/milvus/internal/querycoordv2/job"
"github.com/milvus-io/milvus/internal/querycoordv2/meta"
@ -188,6 +189,7 @@ func (suite *ServiceSuite) SetupTest() {
suite.server.meta,
suite.server.targetMgr,
suite.targetObserver,
&checkers.CheckerController{},
)
suite.server.UpdateStateCode(commonpb.StateCode_Healthy)