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

enhance: [skip e2e] fix integration block UT 30 minutes after failed and use merr (#30125) 

Signed-off-by: aoiasd <zhicheng.yue@zilliz.com>
pull/30261/head
aoiasd 2024-01-25 10:09:02 +08:00 committed by GitHub
parent 8c58d9af67
commit da749c0df2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/integration/jsonexpr/json_expr_test.go
View File

@ -34,6 +34,7 @@ import (
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/log"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/metric"
"github.com/milvus-io/milvus/tests/integration"
)
@ -722,7 +723,7 @@ func (s *JSONExprSuite) insertFlushIndexLoad(ctx context.Context, dbName, collec
NumRows: uint32(rowNum),
})
s.NoError(err)
s.Equal(insertResult.GetStatus().GetErrorCode(), commonpb.ErrorCode_Success)
s.NoError(merr.Error(insertResult.GetStatus()))
// flush
flushResp, err := s.Cluster.Proxy.Flush(ctx, &milvuspb.FlushRequest{
@ -769,34 +770,37 @@ func (s *JSONExprSuite) insertFlushIndexLoad(ctx context.Context, dbName, collec
},
},
})
if createIndexStatus.GetErrorCode() != commonpb.ErrorCode_Success {
log.Warn("createIndexStatus fail reason", zap.String("reason", createIndexStatus.GetReason()))
s.NoError(err)
if err = merr.Error(createIndexStatus); err != nil {
log.Warn("createIndexStatus failed", zap.Error(err))
}
s.NoError(err)
s.Equal(commonpb.ErrorCode_Success, createIndexStatus.GetErrorCode())
s.WaitForIndexBuilt(ctx, collectionName, integration.FloatVecField)
s.WaitForIndexBuilt(ctx, collectionName, integration.FloatVecField)
// load
loadStatus, err := s.Cluster.Proxy.LoadCollection(ctx, &milvuspb.LoadCollectionRequest{
DbName: dbName,
CollectionName: collectionName,
})
s.NoError(err)
if loadStatus.GetErrorCode() != commonpb.ErrorCode_Success {
log.Warn("loadStatus fail reason", zap.String("reason", loadStatus.GetReason()))
s.Require().NoError(err)
if err = merr.Error(loadStatus); err != nil {
log.Warn("loadStatus failed", zap.Error(err))
}
s.Equal(commonpb.ErrorCode_Success, loadStatus.GetErrorCode())
s.Require().NoError(err)
for {
loadProgress, err := s.Cluster.Proxy.GetLoadingProgress(ctx, &milvuspb.GetLoadingProgressRequest{
CollectionName: collectionName,
})
if err != nil {
panic("GetLoadingProgress fail")
}
s.Require().NoError(err)
s.Require().NoError(merr.Error(loadProgress.GetStatus()))
if loadProgress.GetProgress() == 100 {
break
}
time.Sleep(500 * time.Millisecond)
time.Sleep(50 * time.Millisecond)
}
}