Skip to content

Commit 2960cce

Browse files
committed
for now return a flat error if we try to enqueue a workflow in a different queu
1 parent 04390cf commit 2960cce

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dbos/queues_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func TestWorkflowQueues(t *testing.T) {
297297
}
298298

299299
// Check that the error message contains queue information
300-
expectedMsgPart := "different queue"
300+
expectedMsgPart := "Workflow already exists in a different queue"
301301
if !strings.Contains(err.Error(), expectedMsgPart) {
302302
t.Fatalf("expected error message to contain '%s', got '%s'", expectedMsgPart, err.Error())
303303
}

dbos/system_database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ func (s *systemDatabase) InsertWorkflowStatus(ctx context.Context, input insertW
380380
return nil, newConflictingWorkflowError(input.status.ID, fmt.Sprintf("Workflow already exists with a different name: %s, but the provided name is: %s", result.name, input.status.Name))
381381
}
382382
if len(input.status.QueueName) > 0 && result.queueName != nil && input.status.QueueName != *result.queueName {
383-
s.logger.Warn("Queue name conflict for workflow", "workflow_id", input.status.ID, "result_queue", *result.queueName, "status_queue", input.status.QueueName)
383+
return nil, newConflictingWorkflowError(input.status.ID, fmt.Sprintf("Workflow already exists in a different queue: %s, but the provided queue is: %s", *result.queueName, input.status.QueueName))
384384
}
385385

386386
// Every time we start executing a workflow (and thus attempt to insert its status), we increment `recovery_attempts` by 1.

0 commit comments

Comments
 (0)