Skip to content

fix: SetErr on Cmd if the command cannot be queued correctly in multi/exec #3509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 9, 2025
Merged

fix: SetErr on Cmd if the command cannot be queued correctly in multi/exec #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46dff36
set error if queued fails
ndyakov Sep 9, 2025
aee5c0a
try fix for cluster
ndyakov Sep 9, 2025
78be750
add errors to cmds in pipeline if about to be returned
ndyakov Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions osscluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,10 +1712,16 @@ func (c *ClusterClient) txPipelineReadQueued(

for _, cmd := range cmds {
err := statusCmd.readReply(rd)
if err == nil || c.checkMovedErr(ctx, cmd, err, failedCmds) || isRedisError(err) {
continue
if err != nil {
if c.checkMovedErr(ctx, cmd, err, failedCmds) {
// will be processed later
continue
}
cmd.SetErr(err)
if !isRedisError(err) {
return err
}
}
return err
}

// Parse number of replies.
Expand Down
10 changes: 7 additions & 3 deletions redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@ func (c *baseClient) generalProcessPipeline(
return err
})
if lastErr == nil || !canRetry || !shouldRetry(lastErr, true) {
setCmdsErr(cmds, lastErr)
return lastErr
}
}
Expand Down Expand Up @@ -703,9 +704,12 @@ func txPipelineReadQueued(rd *proto.Reader, statusCmd *StatusCmd, cmds []Cmder)
}

// Parse +QUEUED.
for range cmds {
if err := statusCmd.readReply(rd); err != nil && !isRedisError(err) {
return err
for _, cmd := range cmds {
if err := statusCmd.readReply(rd); err != nil {
cmd.SetErr(err)
if !isRedisError(err) {
return err
}
}
}

Expand Down
Loading