diff --git a/configs/milvus.yaml b/configs/milvus.yaml index 684323eee79d41be61ea14baf68ce828fbfb62b1..40234e70ef2d9b5e5c25d34518e8c994711c2026 100644 --- a/configs/milvus.yaml +++ b/configs/milvus.yaml @@ -47,7 +47,6 @@ master: port: 53100 proxyNode: - address: localhost port: 21122 queryService: @@ -62,7 +61,7 @@ queryNode: gracefulTime: 5000 #ms port: 21123 -indexServer: +indexService: address: localhost port: 31000 @@ -74,7 +73,6 @@ dataService: port: 13333 dataNode: - address: localhost port: 21124 log: diff --git a/internal/distributed/datanode/param_table.go b/internal/distributed/datanode/param_table.go index 16ec85970f647145dd0a85fcba94433571708193..863c59cae04bba10d93c5baaae90f0ff04c9cc3b 100644 --- a/internal/distributed/datanode/param_table.go +++ b/internal/distributed/datanode/param_table.go @@ -1,7 +1,6 @@ package grpcdatanode import ( - "os" "sync" "github.com/zilliztech/milvus-distributed/internal/util/funcutil" @@ -36,10 +35,6 @@ func (pt *ParamTable) LoadFromArgs() { func (pt *ParamTable) LoadFromEnv() { Params.IP = funcutil.GetLocalIP() - host := os.Getenv("DATA_NODE_HOST") - if len(host) > 0 { - Params.IP = host - } } func (pt *ParamTable) initPort() { diff --git a/internal/distributed/indexnode/paramtable.go b/internal/distributed/indexnode/paramtable.go index dabc49247d3e8804f63488dd5202e106c6dff1d3..462ed371ebf750fc3d6b801da8821c1007e6da8c 100644 --- a/internal/distributed/indexnode/paramtable.go +++ b/internal/distributed/indexnode/paramtable.go @@ -41,10 +41,6 @@ func (pt *ParamTable) LoadFromEnv() { } Params.IP = funcutil.GetLocalIP() - host := os.Getenv("INDEX_NODE_HOST") - if len(host) > 0 { - Params.IP = host - } } func (pt *ParamTable) initParams() { @@ -54,7 +50,7 @@ func (pt *ParamTable) initParams() { // todo remove and use load from env func (pt *ParamTable) initIndexServerAddress() { - addr, err := pt.Load("indexServer.address") + addr, err := pt.Load("indexService.address") if err != nil { panic(err) } @@ -66,7 +62,7 @@ func (pt *ParamTable) initIndexServerAddress() { } } - port, err := pt.Load("indexServer.port") + port, err := pt.Load("indexService.port") if err != nil { panic(err) } diff --git a/internal/distributed/indexservice/paramtable.go b/internal/distributed/indexservice/paramtable.go index d9ac068d0e201e36c1be94bf1f3b7862d875f78b..1e2fb057bb40a96a4b6324f49d70bfc2b1a5f3be 100644 --- a/internal/distributed/indexservice/paramtable.go +++ b/internal/distributed/indexservice/paramtable.go @@ -31,11 +31,11 @@ func (pt *ParamTable) initParams() { } func (pt *ParamTable) initServicePort() { - pt.ServicePort = pt.ParseInt("indexServer.port") + pt.ServicePort = pt.ParseInt("indexService.port") } func (pt *ParamTable) initServiceAddress() { - addr, err := pt.Load("indexServer.address") + addr, err := pt.Load("indexService.address") if err != nil { panic(err) } @@ -47,7 +47,7 @@ func (pt *ParamTable) initServiceAddress() { } } - port, err := pt.Load("indexServer.port") + port, err := pt.Load("indexService.port") if err != nil { panic(err) } diff --git a/internal/distributed/indexservice/service.go b/internal/distributed/indexservice/service.go index ac35dd7ec10c687e274b903262be6b54b8079ff1..a95c0f2a8f5338c4fd72236b5fe25946d24cddf5 100644 --- a/internal/distributed/indexservice/service.go +++ b/internal/distributed/indexservice/service.go @@ -66,7 +66,7 @@ func (s *Server) start() error { if err := s.impl.Start(); err != nil { return err } - log.Println("indexServer started") + log.Println("indexService started") return nil } diff --git a/internal/distributed/proxynode/paramtable.go b/internal/distributed/proxynode/paramtable.go index 865fb069bcef0b8997dd714dc0ffb5f751c53e91..7e7a8ff065ee1061adbb025a75ec214080d117d9 100644 --- a/internal/distributed/proxynode/paramtable.go +++ b/internal/distributed/proxynode/paramtable.go @@ -69,11 +69,6 @@ func (pt *ParamTable) LoadFromEnv() { } Params.IP = funcutil.GetLocalIP() - host := os.Getenv("PROXY_NODE_HOST") - if len(host) > 0 { - Params.IP = host - } - } func (pt *ParamTable) initParams() { @@ -116,7 +111,7 @@ func (pt *ParamTable) initProxyServiceAddress() { // todo remove and use load from env func (pt *ParamTable) initIndexServerAddress() { - addr, err := pt.Load("indexServer.address") + addr, err := pt.Load("indexService.address") if err != nil { panic(err) } @@ -124,11 +119,11 @@ func (pt *ParamTable) initIndexServerAddress() { hostName, _ := net.LookupHost(addr) if len(hostName) <= 0 { if ip := net.ParseIP(addr); ip == nil { - panic("invalid ip indexServer.address") + panic("invalid ip indexService.address") } } - port, err := pt.Load("indexServer.port") + port, err := pt.Load("indexService.port") if err != nil { panic(err) } diff --git a/internal/distributed/querynode/param_table.go b/internal/distributed/querynode/param_table.go index 42986c2f55481d521a82f4395bdbdccf1b04ea1c..0100021e40619640f11487a0e0c76483cee77fdc 100644 --- a/internal/distributed/querynode/param_table.go +++ b/internal/distributed/querynode/param_table.go @@ -56,10 +56,6 @@ func (pt *ParamTable) LoadFromEnv() { pt.QueryNodeID = UniqueID(queryID) Params.QueryNodeIP = funcutil.GetLocalIP() - host := os.Getenv("QUERY_NODE_HOST") - if len(host) > 0 { - Params.QueryNodeIP = host - } } diff --git a/internal/indexservice/paramtable.go b/internal/indexservice/paramtable.go index 55193fe2db94c104ceebc19d100916f5261549f8..7e57ca9e43bad33c8735624f7beac10fd7e2f695 100644 --- a/internal/indexservice/paramtable.go +++ b/internal/indexservice/paramtable.go @@ -48,7 +48,7 @@ func (pt *ParamTable) Init() { } func (pt *ParamTable) initAddress() { - addr, err := pt.Load("indexServer.address") + addr, err := pt.Load("indexService.address") if err != nil { panic(err) } @@ -60,7 +60,7 @@ func (pt *ParamTable) initAddress() { } } - port, err := pt.Load("indexServer.port") + port, err := pt.Load("indexService.port") if err != nil { panic(err) } @@ -73,7 +73,7 @@ func (pt *ParamTable) initAddress() { } func (pt *ParamTable) initPort() { - pt.Port = pt.ParseInt("indexServer.port") + pt.Port = pt.ParseInt("indexService.port") } func (pt *ParamTable) initEtcdAddress() { diff --git a/internal/util/paramtable/paramtable.go b/internal/util/paramtable/paramtable.go index 6eab481d4fc98166aadb0446e462973bd775b67d..5a634a2698a4178aea5cee93c6a1f82cf7107d5e 100644 --- a/internal/util/paramtable/paramtable.go +++ b/internal/util/paramtable/paramtable.go @@ -164,11 +164,11 @@ func (gp *BaseTable) tryloadFromEnv() { indexBuilderAddress := os.Getenv("INDEX_SERVICE_ADDRESS") if indexBuilderAddress == "" { - indexBuilderHost, err := gp.Load("indexServer.address") + indexBuilderHost, err := gp.Load("indexService.address") if err != nil { panic(err) } - port, err := gp.Load("indexServer.port") + port, err := gp.Load("indexService.port") if err != nil { panic(err) }