Fix bucket name in index builder and query node

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/4973/head^2
bigsheeper 2021-01-05 15:58:13 +08:00 committed by yefu.chen
parent af1941b6fe
commit e9dc96f931
5 changed files with 23 additions and 6 deletions

View File

@ -83,7 +83,7 @@ func CreateBuilder(ctx context.Context) (*Builder, error) {
return nil, err
}
b.kv, err = miniokv.NewMinIOKV(b.loopCtx, minIOClient, "milvus-distributed-indexbuilder")
b.kv, err = miniokv.NewMinIOKV(b.loopCtx, minIOClient, Params.MinioBucketName)
if err != nil {
return nil, err
}

View File

@ -23,6 +23,7 @@ type ParamTable struct {
MinIOAccessKeyID string
MinIOSecretAccessKey string
MinIOUseSSL bool
MinioBucketName string
}
var Params ParamTable
@ -38,6 +39,7 @@ func (pt *ParamTable) Init() {
pt.initMinIOAccessKeyID()
pt.initMinIOSecretAccessKey()
pt.initMinIOUseSSL()
pt.initMinioBucketName()
}
func (pt *ParamTable) initAddress() {
@ -142,3 +144,11 @@ func (pt *ParamTable) initMinIOUseSSL() {
panic(err)
}
}
func (pt *ParamTable) initMinioBucketName() {
bucketName, err := pt.Load("minio.bucketName")
if err != nil {
panic(err)
}
pt.MinioBucketName = bucketName
}

View File

@ -47,9 +47,7 @@ func newLoadIndexService(ctx context.Context, replica collectionReplica) *loadIn
panic(err)
}
// TODO: load bucketName from config
bucketName := "query-node-load-index-service-minio"
MinioKV, err := minioKV.NewMinIOKV(ctx1, minioClient, bucketName)
MinioKV, err := minioKV.NewMinIOKV(ctx1, minioClient, Params.MinioBucketName)
if err != nil {
panic(err)
}

View File

@ -74,8 +74,7 @@ func TestLoadIndexService(t *testing.T) {
Secure: Params.MinioUseSSLStr,
})
assert.Equal(t, err, nil)
bucketName := "query-node-load-index-service-minio"
minioKV, err := minioKV.NewMinIOKV(node.queryNodeLoopCtx, minioClient, bucketName)
minioKV, err := minioKV.NewMinIOKV(node.queryNodeLoopCtx, minioClient, Params.MinioBucketName)
assert.Equal(t, err, nil)
indexPaths := make([]string, 0)
for _, index := range binarySet {

View File

@ -26,6 +26,7 @@ type ParamTable struct {
MinioAccessKeyID string
MinioSecretAccessKey string
MinioUseSSLStr bool
MinioBucketName string
// dm
InsertChannelNames []string
@ -98,6 +99,7 @@ func (p *ParamTable) Init() {
p.initMinioAccessKeyID()
p.initMinioSecretAccessKey()
p.initMinioUseSSLStr()
p.initMinioBucketName()
p.initPulsarAddress()
p.initETCDAddress()
@ -174,6 +176,14 @@ func (p *ParamTable) initMinioUseSSLStr() {
p.MinioUseSSLStr = sslBoolean
}
func (p *ParamTable) initMinioBucketName() {
bucketName, err := p.Load("minio.bucketName")
if err != nil {
panic(err)
}
p.MinioBucketName = bucketName
}
func (p *ParamTable) initPulsarAddress() {
url, err := p.Load("_PulsarAddress")
if err != nil {