fix(agent): 图片审批 - 修改生成参数时不再因容量检查自锁
审批落库时已经持有存储锁,干跑创建任务又申请同一把锁。互斥锁不能重入,修改图片参数会一直停住,后端测试也会在 20 分钟后超时。
This commit is contained in:
1 parent
572bc341f0
commit
d9981d1ec3
4 files changed
+33
-14
No files matched your search
@@ -119,8 +119,15 @@ func (s *Service) CreateTask(userID string, req CreateTaskRequest) (*model.Task,
|
||||
return nil, BadAuthRequest(fmt.Sprintf("同时排队或运行的任务最多 %d 个,请等待已有任务完成", policy.Task.ActiveTaskLimit))
|
||||
}
|
||||
// 媒体任务在扣费和调用上游前确认账号文件容量,避免容量已满仍然计费却无法回存产物。
|
||||
if err := s.requireStoredFileCapacityForTask(userID, taskType, policy); err != nil {
|
||||
return nil, err
|
||||
// 调用方已持锁时走不加锁的版本;这里不能再抢同一把 storageMu。
|
||||
var capacityErr error
|
||||
if req.callerHoldsStorageMu {
|
||||
capacityErr = s.requireStoredFileCapacityWhileLocked(userID, taskType, policy)
|
||||
} else {
|
||||
capacityErr = s.requireStoredFileCapacityForTask(userID, taskType, policy)
|
||||
}
|
||||
if capacityErr != nil {
|
||||
return nil, capacityErr
|
||||
}
|
||||
task := model.Task{ID: newID(), UserID: userID, TraceID: req.TraceID, RequestID: req.RequestID, ProjectID: req.ProjectID, Type: taskType, Status: model.TaskStatusQueued, Stage: "等待队列调度", Progress: 5, Prompt: prompt, Operation: req.Operation, Provider: req.Provider, Model: req.Model}
|
||||
if req.admission != nil {
|
||||
|
||||
Reference in new issue
Block a user