mirror of https://github.com/milvus-io/milvus.git
enhance: always enable streaming service (#40253)
issue: #38399 Signed-off-by: chyezh <chyezh@outlook.com>pull/40271/head
parent
0a4e7b5116
commit
bc8e02df44
|
@ -28,10 +28,15 @@ import (
|
||||||
"github.com/milvus-io/milvus/cmd/asan"
|
"github.com/milvus-io/milvus/cmd/asan"
|
||||||
"github.com/milvus-io/milvus/cmd/milvus"
|
"github.com/milvus-io/milvus/cmd/milvus"
|
||||||
"github.com/milvus-io/milvus/internal/util/sessionutil"
|
"github.com/milvus-io/milvus/internal/util/sessionutil"
|
||||||
|
"github.com/milvus-io/milvus/internal/util/streamingutil"
|
||||||
"github.com/milvus-io/milvus/pkg/v2/util/paramtable"
|
"github.com/milvus-io/milvus/pkg/v2/util/paramtable"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
// after 2.6.0, we enable streaming service by default.
|
||||||
|
// TODO: after remove all streamingutil.IsStreamingServiceEnabled(), we can remove this code.
|
||||||
|
streamingutil.SetStreamingServiceEnabled()
|
||||||
|
|
||||||
defer asan.LsanDoLeakCheck()
|
defer asan.LsanDoLeakCheck()
|
||||||
idx := slices.Index(os.Args, "--run-with-subprocess")
|
idx := slices.Index(os.Args, "--run-with-subprocess")
|
||||||
|
|
||||||
|
|
|
@ -149,7 +149,6 @@ func GetMilvusRoles(args []string, flags *flag.FlagSet) *roles.MilvusRoles {
|
||||||
case typeutil.IndexNodeRole:
|
case typeutil.IndexNodeRole:
|
||||||
role.EnableIndexNode = true
|
role.EnableIndexNode = true
|
||||||
case typeutil.StreamingNodeRole:
|
case typeutil.StreamingNodeRole:
|
||||||
streamingutil.MustEnableStreamingService()
|
|
||||||
streamingutil.EnableEmbededQueryNode()
|
streamingutil.EnableEmbededQueryNode()
|
||||||
role.EnableStreamingNode = true
|
role.EnableStreamingNode = true
|
||||||
role.EnableQueryNode = true
|
role.EnableQueryNode = true
|
||||||
|
@ -206,10 +205,6 @@ func formatFlags(args []string, flags *flag.FlagSet) (alias string, enableRootCo
|
||||||
flags.BoolVar(&enableProxy, typeutil.ProxyRole, false, "enable proxy node")
|
flags.BoolVar(&enableProxy, typeutil.ProxyRole, false, "enable proxy node")
|
||||||
flags.BoolVar(&enableStreamingNode, typeutil.StreamingNodeRole, false, "enable streaming node")
|
flags.BoolVar(&enableStreamingNode, typeutil.StreamingNodeRole, false, "enable streaming node")
|
||||||
|
|
||||||
if enableStreamingNode {
|
|
||||||
streamingutil.MustEnableStreamingService()
|
|
||||||
}
|
|
||||||
|
|
||||||
serverType := args[2]
|
serverType := args[2]
|
||||||
if serverType == typeutil.EmbeddedRole {
|
if serverType == typeutil.EmbeddedRole {
|
||||||
flags.SetOutput(io.Discard)
|
flags.SetOutput(io.Discard)
|
||||||
|
|
|
@ -14,6 +14,14 @@ func IsStreamingServiceEnabled() bool {
|
||||||
return os.Getenv(MilvusStreamingServiceEnabled) == "1"
|
return os.Getenv(MilvusStreamingServiceEnabled) == "1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetStreamingServiceEnabled set the env that indicates whether the streaming service is enabled.
|
||||||
|
func SetStreamingServiceEnabled() {
|
||||||
|
err := os.Setenv(MilvusStreamingServiceEnabled, "1")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// MustEnableStreamingService panics if the streaming service is not enabled.
|
// MustEnableStreamingService panics if the streaming service is not enabled.
|
||||||
func MustEnableStreamingService() {
|
func MustEnableStreamingService() {
|
||||||
if !IsStreamingServiceEnabled() {
|
if !IsStreamingServiceEnabled() {
|
||||||
|
|
|
@ -5,14 +5,6 @@ package streamingutil
|
||||||
|
|
||||||
import "os"
|
import "os"
|
||||||
|
|
||||||
// SetStreamingServiceEnabled set the env that indicates whether the streaming service is enabled.
|
|
||||||
func SetStreamingServiceEnabled() {
|
|
||||||
err := os.Setenv(MilvusStreamingServiceEnabled, "1")
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnsetStreamingServiceEnabled unsets the env that indicates whether the streaming service is enabled.
|
// UnsetStreamingServiceEnabled unsets the env that indicates whether the streaming service is enabled.
|
||||||
func UnsetStreamingServiceEnabled() {
|
func UnsetStreamingServiceEnabled() {
|
||||||
err := os.Setenv(MilvusStreamingServiceEnabled, "0")
|
err := os.Setenv(MilvusStreamingServiceEnabled, "0")
|
||||||
|
|
|
@ -50,3 +50,6 @@ nohup ./bin/milvus run indexcoord --run-with-subprocess > /tmp/indexcoord.log
|
||||||
|
|
||||||
echo "Starting indexnode..."
|
echo "Starting indexnode..."
|
||||||
nohup ./bin/milvus run indexnode --run-with-subprocess > /tmp/indexnode.log 2>&1 &
|
nohup ./bin/milvus run indexnode --run-with-subprocess > /tmp/indexnode.log 2>&1 &
|
||||||
|
|
||||||
|
echo "Starting streamingnode..."
|
||||||
|
nohup ./bin/milvus run streamingnode --run-with-subprocess > /tmp/streamingnode.log 2>&1 &
|
||||||
|
|
Loading…
Reference in New Issue