RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix: move migrate into init flag case list (#20048)
Lynn09bcad8b6cf6
diff --git a/cmd/ragflow_server.go b/cmd/ragflow_server.goindex 5206e92ed1..1a0a478efa 100644--- a/cmd/ragflow_server.go+++ b/cmd/ragflow_server.go@@ -39,7 +39,7 @@ import ("ragflow/internal/handler""ragflow/internal/ingestion/knowledge_compile"ingestion "ragflow/internal/ingestion/service"- "ragflow/internal/rag/agentic-rag"+ agentic_rag "ragflow/internal/rag/agentic-rag""ragflow/internal/router""ragflow/internal/server/local""ragflow/internal/service"@@ -65,7 +65,7 @@ import ("ragflow/internal/agent/component""ragflow/internal/common""ragflow/internal/dao"- "ragflow/internal/deepdoc/parser/pdf/inference/native_analyzer"+ infnative "ragflow/internal/deepdoc/parser/pdf/inference/native_analyzer""ragflow/internal/engine""ragflow/internal/engine/kvrocks""ragflow/internal/entity"@@ -75,11 +75,10 @@ import ()type serverArgs struct {- mode *string // admin | api | ingestor | syncer | deepdoc+ mode *string // admin | api | ingestor | syncer | deepdoc | migratehelpFlag boolversionFlag boollogLevel *string- migrateDB boolconfigPath *string // Used by admin, api; user defined config pathinitSuperUser bool // Used by admin;port *int // Used by admin, api@@ -96,6 +95,7 @@ type serverArgs struct {func parseArgs() (*serverArgs, error) {args := &serverArgs{}+ // Mode flags share one variable, so the last one passed wins.var serverMode stringvar configPath stringfor i := 1; i < len(os.Args); i++ {@@ -125,8 +125,6 @@ func parseArgs() (*serverArgs, error) {case "--admin":serverMode = "admin"args.mode = &serverMode- case "--migrate":- args.migrateDB = truecase "--ingestor":serverMode = "ingestor"args.mode = &serverMode@@ -139,6 +137,9 @@ func parseArgs() (*serverArgs, error) {case "--deepdoc":serverMode = "deepdoc"args.mode = &serverMode+ case "--migrate":+ serverMode = "migrate"+ args.mode = &serverModecase "-h", "--help":args.helpFlag = truecase "-v", "--version":@@ -217,9 +218,6 @@ func parseArgs() (*serverArgs, error) {}}- if args.migrateDB && args.mode != nil {- return nil, errors.New("--migrate cannot be combined with a server mode")- }return args, nil}@@ -268,7 +266,7 @@ func resolveDeepDocInferenceConcurrency(args *serverArgs, configured int) int {func printHelp(args *serverArgs) {switch {- case args.mode == nil:+ case args.mode == nil || *args.mode == "migrate":fmt.Fprintf(os.Stderr, "Usage: %s --api|--admin|--ingestor|--syncer|--deepdoc [OPTIONS]\n", os.Args[0])fmt.Fprintf(os.Stderr, " %s --migrate [OPTIONS]\n\n", os.Args[0])fmt.Fprintf(os.Stderr, "RAGFlow Server - Open-source RAG engine based on deep document understanding\n\n")@@ -363,7 +361,7 @@ func main() {os.Exit(1)}- if arguments.helpFlag || (arguments.mode == nil && !arguments.migrateDB) {+ if arguments.helpFlag || arguments.mode == nil {printHelp(arguments)os.Exit(1)}@@ -373,13 +371,6 @@ func main() {os.Exit(1)}- if arguments.migrateDB {- if err = runMigrate(ctx, arguments); err != nil {- common.Fatal("Failed to run database migration", zap.Error(err))- }- return- }-// Initialize local variables (runtime variables from Redis)err = server.InitLocalVariables()if err != nil {@@ -459,6 +450,10 @@ func main() {uuid := utility.GenerateUUID()serverName = fmt.Sprintf("deepdoc_server_%s", uuid)}+ case "migrate":+ if arguments.name == nil {+ serverName = "migrate"+ }default:err = errors.New(*arguments.mode)common.Error("invalid server mode", err)@@ -492,10 +487,21 @@ func main() {}()}- // Initialize database- if err = dao.InitDB(ctx, false); err != nil {+ // Initialize database. The migrate mode stops here: it needs neither the+ // downgrade check nor any of the engines started below, so it can run+ // before any server mode boots (see docker/entrypoint-go.sh and+ // docker/launch_backend_service.sh).+ migrate := *arguments.mode == "migrate"+ if migrate {+ common.Info("Running database migrations")+ }+ if err = dao.InitDB(ctx, migrate); err != nil {common.Fatal("Failed to initialize database", zap.Error(err))}+ if migrate {+ common.Info("Database migrations completed")+ return+ }if err = checkDatabaseVersion(ctx); err != nil {common.Fatal("Refusing to start: database was migrated by a newer version", zap.Error(err))@@ -643,58 +649,6 @@ func checkDatabaseVersion(ctx context.Context) error {return nil}-// runMigrate runs the database schema and data migrations and returns. It is-// the whole of the standalone --migrate action: load the configuration, run-// dao.InitDB with migrations enabled, then exit. It deliberately does not call-// registerNativeDeepDoc or initialize the doc engine, Redis, storage or the-// message queue, so it can run on its own, before any server mode boots (see-// docker/entrypoint-go.sh and docker/launch_backend_service.sh).-func runMigrate(ctx context.Context, args *serverArgs) error {- const serverName = "migrate"-- if err := server.InitLocalVariables(); err != nil {- return fmt.Errorf("initialize local variables: %w", err)- }-- logLevel := selectedLogLevel(args, "")- if err := common.InitLogger(logLevel, common.FileOutput{Filename: serverName + ".log", Path: "logs"}, serverName); err != nil {- return fmt.Errorf("initialize logger: %w", err)- }-- var configPath string- if args.configPath != nil {- configPath = *args.configPath- }- if err := server.Init(configPath); err != nil {- return fmt.Errorf("initialize configuration: %w", err)- }-- globalConfig := server.GetConfig()- server.SetServerName(serverName)- logConfig := globalConfig.GetLogConfig()- logLevel = selectedLogLevel(args, logConfig.Level)- globalConfig.SetLogLevel(logLevel)-- common.SyncLog()- if err := common.InitLogger(logLevel, common.FileOutput{- Filename: serverName + ".log",- Path: logConfig.Path,- MaxSize: logConfig.MaxSize,- MaxBackups: logConfig.MaxBackups,- MaxAge: logConfig.MaxAge,- Compress: logConfig.Compress,- }, serverName); err != nil {- common.Error("Failed to reinitialize logger with configured level", err)- }-- common.Info("Running database migrations")- if err := dao.InitDB(ctx, true); err != nil {- return fmt.Errorf("initialize database: %w", err)- }- common.Info("Database migrations completed")- return nil-}-func runAdmin(ctx context.Context, serverName string, args *serverArgs) error {globalConfig := server.GetConfig()diff --git a/cmd/ragflow_server_test.go b/cmd/ragflow_server_test.goindex 2d1f9545f9..072087ec50 100644--- a/cmd/ragflow_server_test.go+++ b/cmd/ragflow_server_test.go@@ -34,16 +34,13 @@ func parseArgsForTest(t *testing.T, argv ...string) (*serverArgs, error) {return parseArgs()}-func TestParseArgsMigrateIsStandalone(t *testing.T) {+func TestParseArgsMigrateSelectsMode(t *testing.T) {args, err := parseArgsForTest(t, "--migrate")if err != nil {t.Fatalf("parseArgs(--migrate) error = %v", err)}- if !args.migrateDB {- t.Fatal("migrateDB = false, want true")- }- if args.mode != nil {- t.Fatalf("mode = %q, want nil: --migrate must not select a server mode", *args.mode)+ if args.mode == nil || *args.mode != "migrate" {+ t.Fatalf("mode = %v, want migrate", args.mode)}}@@ -91,27 +88,28 @@ func TestSelectedLogLevelPrecedence(t *testing.T) {}}-func TestParseArgsMigrateRejectsMode(t *testing.T) {+// Mode flags share a single slot, so the last one passed wins. Putting+// --migrate next to a server mode is not a runtime conflict, so it must not+// be rejected.+func TestParseArgsMigrateFollowsLastModeWins(t *testing.T) {for _, mode := range []string{"--api", "--admin", "--ingestor", "--syncer"} {- if _, err := parseArgsForTest(t, mode, "--migrate"); err == nil {- t.Errorf("parseArgs(%s --migrate) error = nil, want error", mode)+ want := strings.TrimPrefix(mode, "--")++ args, err := parseArgsForTest(t, mode, "--migrate")+ if err != nil {+ t.Fatalf("parseArgs(%s --migrate) error = %v", mode, err)}- if _, err := parseArgsForTest(t, "--migrate", mode); err == nil {- t.Errorf("parseArgs(--migrate %s) error = nil, want error", mode)+ if args.mode == nil || *args.mode != "migrate" {+ t.Errorf("parseArgs(%s --migrate) mode = %v, want migrate", mode, args.mode)}- }-}-func TestParseArgsModeResetsMigrate(t *testing.T) {- args, err := parseArgsForTest(t, "--api")- if err != nil {- t.Fatalf("parseArgs(--api) error = %v", err)- }- if args.mode == nil || *args.mode != "api" {- t.Fatalf("mode = %v, want api", args.mode)- }- if args.migrateDB {- t.Fatal("migrateDB = true, want false")+ args, err = parseArgsForTest(t, "--migrate", mode)+ if err != nil {+ t.Fatalf("parseArgs(--migrate %s) error = %v", mode, err)+ }+ if args.mode == nil || *args.mode != want {+ t.Errorf("parseArgs(--migrate %s) mode = %v, want %s", mode, args.mode, want)+ }}}