Merge pull request #101261 from cockroachdb/blathers/backport-release…

…-23.1-100868 release-23.1: jobs: wrap payload vs progress err differently
cockroachdb · Apr 12, 2023 · 58f543f · 58f543f
2 parents c8a4703 + 3c2f272
commit 58f543f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/jobs/adopt.go b/pkg/jobs/adopt.go
@@ -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
@@ -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 {

diff --git a/pkg/jobs/jobs.go b/pkg/jobs/jobs.go
@@ -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
@@ -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()}