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

remove query node id env dependency and fix start script (#5874) 

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/5880/head
bigsheeper 2021-06-18 19:00:15 +08:00 committed by GitHub
parent fc4dd7d170
commit 710ac1a4f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/roles/roles.go
View File

@ -328,7 +328,6 @@ func (mr *MilvusRoles) Run(localMsg bool) {
// only standalone enable localMsg
if localMsg {
os.Setenv("QUERY_NODE_ID", "1")
os.Setenv("DEPLOY_MODE", "STANDALONE")
cfg := mr.setLogConfigFilename("standalone.log")
logutil.SetupLogger(cfg)

16
internal/distributed/querynode/param_table.go
View File

@ -12,8 +12,6 @@
package grpcquerynode
import (
"os"
"strconv"
"sync"
"github.com/milvus-io/milvus/internal/util/funcutil"
@ -53,21 +51,7 @@ func (pt *ParamTable) LoadFromArgs() {
}
func (pt *ParamTable) LoadFromEnv() {
// todo assign by queryservice and set by read initparms
queryNodeIDStr := os.Getenv("QUERY_NODE_ID")
if queryNodeIDStr == "" {
panic("Can't Get QUERY_NODE_ID")
}
queryID, err := strconv.Atoi(queryNodeIDStr)
if err != nil {
panic(err)
}
pt.QueryNodeID = UniqueID(queryID)
Params.QueryNodeIP = funcutil.GetLocalIP()
}
func (pt *ParamTable) initMasterAddress() {

28
scripts/start.sh
View File

@ -1,27 +1,25 @@
cd ..
echo "starting master"
nohup ./bin/milvus run master > ~/masterservice.out 2>&1 &
echo "starting rootcoord"
nohup ./bin/milvus run rootcoord > ~/rootcoord.log 2>&1 &
echo "starting dataservice"
nohup ./bin/milvus run dataservice > ~/dataservice.out 2>&1 &
echo "starting datacoord"
nohup ./bin/milvus run datacoord > ~/datacoord.log 2>&1 &
echo "starting datanode"
nohup ./bin/milvus run datanode > ~/datanode.out 2>&1 &
nohup ./bin/milvus run datanode > ~/datanode.log 2>&1 &
echo "starting proxynode"
nohup ./bin/milvus run proxynode > ~/proxynode.out 2>&1 &
echo "starting proxy"
nohup ./bin/milvus run proxy > ~/proxy.log 2>&1 &
echo "starting queryservice"
nohup ./bin/milvus run queryservice > ~/queryservice.out 2>&1 &
echo "starting querycoord"
nohup ./bin/milvus run querycoord > ~/querycoord.log 2>&1 &
echo "starting querynode1"
export QUERY_NODE_ID=1
nohup ./bin/milvus run querynode > ~/querynode1.out 2>&1 &
nohup ./bin/milvus run querynode > ~/querynode1.log 2>&1 &
echo "starting indexservice"
nohup ./bin/milvus run indexservice > ~/indexservice.out 2>&1 &
echo "starting indexcoord"
nohup ./bin/milvus run indexcoord > ~/indexcoord.log 2>&1 &
echo "starting indexnode"
nohup ./bin/milvus run indexnode > ~/indexnode.out 2>&1 &
nohup ./bin/milvus run indexnode > ~/indexnode.log 2>&1 &