Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix init admin client status (#21316)

Jin Hai2cc2bcabad94
diff --git a/internal/server/api/server.go b/internal/server/api/server.go
index 07212a81d3..a851b67e41 100644
--- a/internal/server/api/server.go
+++ b/internal/server/api/server.go
@@ -62,9 +62,6 @@ import (
)
func Run(ctx context.Context, serverName string, args *bootstrap.ServerArgs) error {
- // Initialize admin status (default: unavailable=1)
- local.InitAdminStatus(1, "admin server not connected")
-
// Initialize tokenizer (rag_analyzer)
// tokenizer.Init fills DictPath from env var or default, so
// tokenizerCfg.DictPath carries the resolved path for downstream use.
@@ -455,6 +452,9 @@ func startServer(ctx context.Context, serverName string, arguments *bootstrap.Se
common.Info(fmt.Sprintf("RAGFlow Go Version: %s", common.GetRAGFlowVersion()))
common.Info(fmt.Sprintf("Server starting on port: %d", apiServerConfig.HTTPPort))
+ // Initialize admin status (default: unavailable=1)
+ local.InitAdminStatus()
+
// Set log level
bootstrap.SetLogger(serverName, arguments)
diff --git a/internal/server/bootstrap/runtime.go b/internal/server/bootstrap/runtime.go
index 4cd6e6611e..f3028e2537 100644
--- a/internal/server/bootstrap/runtime.go
+++ b/internal/server/bootstrap/runtime.go
@@ -82,9 +82,9 @@ func StartHeartbeat(serverType common.ServerType, serverID string, port int, hea
heartbeatReporter := utility.NewScheduledTask("Heartbeat reporter", heartBeatInterval, func() {
if err = service.AdminServiceClient.SendHeartbeat(); err == nil {
- local.SetAdminStatus(0, "")
+ local.SetAdminStatus(local.Available, "")
} else {
- local.SetAdminStatus(1, err.Error())
+ local.SetAdminStatus(local.Unavailable, err.Error())
}
})
heartbeatReporter.Start()
diff --git a/internal/server/ingestor/server.go b/internal/server/ingestor/server.go
index 6f9d5e9e01..dd4caa9d6c 100644
--- a/internal/server/ingestor/server.go
+++ b/internal/server/ingestor/server.go
@@ -22,6 +22,7 @@ import (
"context"
"fmt"
"os"
+ "ragflow/internal/server/local"
"strconv"
"strings"
"time"
@@ -218,6 +219,9 @@ func Run(ctx context.Context, cancel context.CancelFunc, serverName string, args
// Print RAGFlow version
common.Info(fmt.Sprintf("RAGFlow ingestion service version: %s", common.GetRAGFlowVersion()))
+ // Init admin client status in ingestor
+ local.InitAdminStatus()
+
// Set log level
bootstrap.SetLogger(serverName, args)
diff --git a/internal/server/local/admin_status.go b/internal/server/local/admin_status.go
index 4bbb377e0c..20e1038f75 100644
--- a/internal/server/local/admin_status.go
+++ b/internal/server/local/admin_status.go
@@ -24,9 +24,18 @@ import (
// AdminStatus represents the admin status
// 0 = valid, 1 = invalid
+
+type AdminStatusCode int
+
+const (
+ Available AdminStatusCode = 0
+ Unavailable AdminStatusCode = 1
+ NotInitialized AdminStatusCode = 10
+)
+
type AdminStatus struct {
- Status int `json:"status"` // 0 = available, 1 = not available
- Reason string `json:"reason"` // reason for invalid status
+ Status AdminStatusCode `json:"status"` // 0 = available, 1 = not available
+ Reason string `json:"reason"` // reason for invalid status
}
var (
@@ -37,11 +46,11 @@ var (
// InitAdminStatus initializes the global admin status
// status: 0 = valid, 1 = invalid (default)
-func InitAdminStatus(status int, reason string) {
+func InitAdminStatus() {
adminStatusOnce.Do(func() {
adminStatus = &AdminStatus{
- Status: status,
- Reason: reason,
+ Status: NotInitialized,
+ Reason: "admin server not connected",
}
})
}
@@ -60,18 +69,29 @@ func GetAdminStatus() AdminStatus {
}
// SetAdminStatus updates the admin status
-func SetAdminStatus(status int, reason string) {
+func SetAdminStatus(statusCode AdminStatusCode, reason string) {
adminStatusMu.Lock()
defer adminStatusMu.Unlock()
if adminStatus == nil {
- adminStatus = &AdminStatus{}
+ common.Fatal("Admin server status not initialized")
}
- adminStatus.Status = status
- adminStatus.Reason = reason
- if adminStatus.Status != 0 {
- common.Warn(fmt.Sprintf("Admin server is unavailable, reason: %s", adminStatus.Reason))
+ if adminStatus.Status == statusCode {
+ return
}
+
+ switch statusCode {
+ case Available:
+ common.Warn(fmt.Sprintf("Admin server is available"))
+ case Unavailable:
+ common.Warn(fmt.Sprintf("Admin server is unavailable, code: %d, reason: %s", statusCode, reason))
+ default:
+ common.Fatal(fmt.Sprintf("Invalid admin status code: %d, reason: %s", statusCode, reason))
+ return
+ }
+
+ adminStatus.Status = statusCode
+ adminStatus.Reason = reason
}
// IsAdminAvailable returns true if admin is valid (Status == 0)
@@ -81,5 +101,5 @@ func IsAdminAvailable() bool {
if adminStatus == nil {
return false
}
- return adminStatus.Status == 0
+ return adminStatus.Status == Available
}
diff --git a/internal/server/syncer/server.go b/internal/server/syncer/server.go
index 5edf392f5a..19fad4c816 100644
--- a/internal/server/syncer/server.go
+++ b/internal/server/syncer/server.go
@@ -21,6 +21,7 @@ package syncer
import (
"context"
"fmt"
+ "ragflow/internal/server/local"
"ragflow/internal/common"
"ragflow/internal/server"
@@ -51,6 +52,9 @@ func Run(ctx context.Context, cancel context.CancelFunc, serverName string, args
// Print RAGFlow version
common.Info(fmt.Sprintf("RAGFlow file syncer service version: %s", common.GetRAGFlowVersion()))
+ // Init admin client status in syncer
+ local.InitAdminStatus()
+
// Set log level
bootstrap.SetLogger(serverName, args)