Skip to content

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

fix(syncer): preserve context cancellation during task checks (#21481)

adwsc65f0e1ffe76
diff --git a/internal/syncer/sync_runner.go b/internal/syncer/sync_runner.go
index 98934599c4..bae8582943 100644
--- a/internal/syncer/sync_runner.go
+++ b/internal/syncer/sync_runner.go
@@ -47,6 +47,9 @@ func checkTaskCanceled(taskDAO *dao.SyncTaskDAO, ctx context.Context, taskID str
return err
}
canceled, err := taskDAO.IsTaskCanceled(ctx, taskID)
+ if ctxErr := ctx.Err(); ctxErr != nil {
+ return ctxErr
+ }
if err != nil {
return err
}
diff --git a/internal/syncer/syncer_test.go b/internal/syncer/syncer_test.go
index 184d1ad899..541bbcd056 100644
--- a/internal/syncer/syncer_test.go
+++ b/internal/syncer/syncer_test.go
@@ -239,6 +239,11 @@ func setupSyncerDB(t *testing.T) *gorm.DB {
if err != nil {
t.Fatalf("open sqlite: %v", err)
}
+ sqlDB, err := db.DB()
+ if err != nil {
+ t.Fatalf("get sqlite connection: %v", err)
+ }
+ t.Cleanup(func() { _ = sqlDB.Close() })
if err = db.AutoMigrate(&entity.Connector{}, &entity.Connector2Kb{}, &entity.Knowledgebase{}, &entity.SyncLogs{}, &entity.Document{}); err != nil {
t.Fatalf("migrate sqlite: %v", err)
}
@@ -1227,6 +1232,43 @@ func TestCancelStopsRunningSync(t *testing.T) {
}
}
+func TestCheckTaskCanceledDuringQuery(t *testing.T) {
+ queryErr := errors.New("interrupted (9)")
+ for _, tt := range []struct {
+ name string
+ cancel bool
+ queryErr error
+ wantErr error
+ }{
+ {"canceled_query_error", true, queryErr, context.Canceled},
+ {"canceled_successful_query", true, nil, context.Canceled},
+ {"query_error", false, queryErr, queryErr},
+ } {
+ t.Run(tt.name, func(t *testing.T) {
+ db := setupSyncerDB(t)
+ insertTaskContext(t, db, "conn-1", "kb-1", "task-1", dao.TaskTypeSync)
+ ctx, cancel := context.WithCancel(t.Context())
+ defer cancel()
+
+ // Cancel as the status query returns, independent of goroutine timing.
+ if err := db.Callback().Query().After("gorm:query").Register("test:cancel_status_query", func(tx *gorm.DB) {
+ if tt.cancel {
+ cancel()
+ }
+ if tt.queryErr != nil {
+ tx.AddError(tt.queryErr)
+ }
+ }); err != nil {
+ t.Fatalf("register query callback: %v", err)
+ }
+
+ if err := checkTaskCanceled(dao.NewSyncTaskDAO(db), ctx, "task-1"); !errors.Is(err, tt.wantErr) {
+ t.Fatalf("checkTaskCanceled error = %v, want %v", err, tt.wantErr)
+ }
+ })
+ }
+}
+
// TestSyncRunnerResultWaitHonorsCancel verifies Run does not block forever waiting for job results after cancellation.
func TestSyncRunnerResultWaitHonorsCancel(t *testing.T) {
db := setupSyncerDB(t)