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

Check if loaded in Proxy when LoadCollection (#18074)

Browse Source 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
This commit is contained in:
bigsheeper 2022-07-05 21:16:20 +08:00 committed by GitHub
parent 555ebb8ea5
commit 696d747afa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/proxy/proxy_test.go
View File

@ -1172,6 +1172,18 @@ func TestProxy(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, commonpb.ErrorCode_Success, resp.ErrorCode)
// load the same collection, test loaded check
colInfo, err := globalMetaCache.GetCollectionInfo(ctx, collectionName)
assert.NoError(t, err)
colInfo.isLoaded = true
resp, err = proxy.LoadCollection(ctx, &milvuspb.LoadCollectionRequest{
Base: nil,
DbName: dbName,
CollectionName: collectionName,
})
assert.NoError(t, err)
assert.Equal(t, commonpb.ErrorCode_Success, resp.ErrorCode)
// load other collection -> fail
resp, err = proxy.LoadCollection(ctx, &milvuspb.LoadCollectionRequest{
Base: nil,

19
internal/proxy/task.go
View File

@ -2590,12 +2590,29 @@ func (lct *loadCollectionTask) Execute(ctx context.Context) (err error) {
if err != nil {
return err
}
// check if loaded
info, err := globalMetaCache.GetCollectionInfo(ctx, lct.CollectionName)
if err != nil {
return fmt.Errorf("GetCollectionInfo failed, collection = %s, err = %s", lct.CollectionName, err)
}
if info.isLoaded { // TODO: may not be thread safe
log.Debug("collection has been loaded",
zap.String("role", typeutil.ProxyRole),
zap.String("collectionName", lct.CollectionName),
zap.Int64("collectionID", collID),
zap.Int64("msgID", lct.GetBase().GetMsgID()))
lct.result = &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}
return nil
}
lct.collectionID = collID
collSchema, err := globalMetaCache.GetCollectionSchema(ctx, lct.CollectionName)
if err != nil {
return err
}
request := &querypb.LoadCollectionRequest{
Base: &commonpb.MsgBase{
MsgType: commonpb.MsgType_LoadCollection,