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(model): delete provider models and instances in one transaction (#19562)
ming1523d8d06bcc3a4d
diff --git a/internal/service/model_service.go b/internal/service/model_service.goindex 89659ab1df..2c9aaf4d0f 100644--- a/internal/service/model_service.go+++ b/internal/service/model_service.go@@ -2215,13 +2215,21 @@ func (m *ModelProviderService) DropProviderInstances(ctx context.Context, providreturn common.CodeNotFound, fmt.Errorf("no instance found for provider %q and instances %q", providerIDOrName, notExistInstances)}- // Second pass: delete models and instances by IDs.+ // Second pass: delete models and instances by IDs atomically.// Mirrors Python's: delete_models_by_instance_ids(instance_ids)// TenantModelInstanceService.delete_by_ids(instance_ids)- if _, err = m.modelDAO.DeleteByInstanceIDs(ctx, dao.DB, instanceIDs); err != nil {- return common.CodeServerError, err- }- if _, err = m.modelInstanceDAO.DeleteByIDs(ctx, dao.DB, instanceIDs); err != nil {+ // Both deletes share one transaction so a failure of the instance delete+ // cannot leave the tenant models already removed (partial deletion).+ err = dao.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ if _, err := m.modelDAO.DeleteByInstanceIDs(ctx, tx, instanceIDs); err != nil {+ return err+ }+ if _, err := m.modelInstanceDAO.DeleteByIDs(ctx, tx, instanceIDs); err != nil {+ return err+ }+ return nil+ })+ if err != nil {return common.CodeServerError, err}diff --git a/internal/service/model_service_test.go b/internal/service/model_service_test.goindex 74c2a43f66..f0959a2d6a 100644--- a/internal/service/model_service_test.go+++ b/internal/service/model_service_test.go@@ -1119,3 +1119,41 @@ func TestModelProviderServiceResolveModelToolSupportPropagatesLookupFailure(t *tt.Errorf("model lookup failure = (%v, nil), want a propagated error", got)}}++func TestDropProviderInstancesRollsBackWhenInstanceDeleteFails(t *testing.T) {+ db := setupModelProviderServiceTestDB(t)+ useModelProviderServiceTestDB(t, db)+ seedModelProviderServiceScope(t, db)++ // Force the second delete (tenant_model_instance) to fail so the+ // transaction must roll back the already-applied tenant_model delete.+ if err := db.Callback().Delete().Before("gorm:DELETE").Register(+ "test:fail_tenant_model_instance_delete",+ func(tx *gorm.DB) {+ if tx.Statement != nil && tx.Statement.Table == "tenant_model_instance" {+ _ = tx.AddError(errors.New("forced tenant_model_instance delete failure"))+ }+ },+ ); err != nil {+ t.Fatalf("failed to register failing delete callback: %v", err)+ }+ t.Cleanup(func() {+ _ = db.Callback().Delete().Remove("test:fail_tenant_model_instance_delete")+ })++ code, err := NewModelProviderService().DropProviderInstances(t.Context(), "provider-1", "user-1", []string{"instance-1"})+ if err == nil {+ t.Fatalf("DropProviderInstances() error = nil, want forced instance delete failure")+ }+ if code != common.CodeServerError {+ t.Fatalf("code = %v, want %v", code, common.CodeServerError)+ }++ var modelCount int64+ if err := db.Model(&entity.TenantModel{}).Where("instance_id = ?", "instance-1").Count(&modelCount).Error; err != nil {+ t.Fatalf("failed to count tenant models: %v", err)+ }+ if modelCount != 1 {+ t.Fatalf("rollback must keep tenant models for the instance, got %d rows", modelCount)+ }+}