Skip to content
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

release-23.1: jobs: wrap payload vs progress err differently #101261

Merged
merged 1 commit into from
Apr 12, 2023
Merged

release-23.1: jobs: wrap payload vs progress err differently #101261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/jobs/adopt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func (r *Registry) resumeJob(
return err
}
if !exists {
return errors.Wrap(&JobNotFoundError{jobID: jobID}, "job not found in system.job_info")
return errors.Wrap(&JobNotFoundError{jobID: jobID}, "job payload not found in system.job_info")
}
if err := protoutil.Unmarshal(payloadBytes, payload); err != nil {
return err
Expand All @@ -339,7 +339,7 @@ func (r *Registry) resumeJob(
return err
}
if !exists {
return errors.Wrap(&JobNotFoundError{jobID: jobID}, "job not found in system.job_info")
return errors.Wrap(&JobNotFoundError{jobID: jobID}, "job progress not found in system.job_info")
}
return protoutil.Unmarshal(progressBytes, progress)
}); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/jobs/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ func (j *Job) loadJobPayloadAndProgress(
return nil, nil, errors.Wrapf(err, "failed to get payload for job %d", j.ID())
}
if !exists {
return nil, nil, errors.Wrap(&JobNotFoundError{jobID: j.ID()}, "job not found in system.job_info")
return nil, nil, errors.Wrap(&JobNotFoundError{jobID: j.ID()}, "job payload not found in system.job_info")
}
if err := protoutil.Unmarshal(payloadBytes, payload); err != nil {
return nil, nil, err
Expand All @@ -775,7 +775,7 @@ func (j *Job) loadJobPayloadAndProgress(
return nil, nil, errors.Wrapf(err, "failed to get progress for job %d", j.ID())
}
if !exists {
return nil, nil, errors.Wrap(&JobNotFoundError{jobID: j.ID()}, "job not found in system.job_info")
return nil, nil, errors.Wrap(&JobNotFoundError{jobID: j.ID()}, "job progress not found in system.job_info")
}
if err := protoutil.Unmarshal(progressBytes, progress); err != nil {
return nil, nil, &JobNotFoundError{jobID: j.ID()}
Expand Down