feat(rst): TODO merge - cleanup error messages

Author: swartzn

rst/sync/internal/workmgr/manager.go

@@ -514,12 +514,12 @@ func (m *Manager) resumeWorkRequest(waitQueueSubmissionId string, waitQueueWorkE
 
 	_, workEntry, commitJournalEntry, err := m.workJournal.CreateAndLockEntry(submissionID)
 	if err != nil {
-		fmt.Printf("unable to create work journal entry for job ID %s work request ID %s: %s\n", jobID, workRequestID, err.Error())
+		return false, fmt.Errorf("failed to create work journal entry for job ID %s: %w", jobID, err)
+
 	}
 	defer func() {
 		if err = commitJournalEntry(); err != nil {
 			m.log.Error("unable to release work journal entry", zap.Error(err), zap.Any("jobID", jobID))
-
 		}
 	}()
 
@@ -529,7 +529,7 @@ func (m *Manager) resumeWorkRequest(waitQueueSubmissionId string, waitQueueWorkE
 
 	_, waitQueueCommitJournalEntry, err := m.workWaitQueueJournal.GetAndLockEntry(waitQueueSubmissionId)
 	if err != nil {
-		return false, fmt.Errorf("failed to get waitQueue work journal entry. What should we do?")
+		return false, fmt.Errorf("failed to get waitQueue work journal entry for job ID %s: %w", jobID, err)
 	}
 	defer func() {
 		if err = waitQueueCommitJournalEntry(kvstore.WithDeleteEntry(true)); err != nil {

rst/sync/internal/workmgr/work.go

@@ -301,22 +301,25 @@ func (w *worker) processWork(work workAssignment) {
 
 		baseKey, err := w.workWaitQueueJournal.GenerateNextPK()
 		if err != nil {
-			// TODO:  // return nil, fmt.Errorf("unable to generate database key for job ID %s: %w", request.GetJobId(), err)
+			w.log.Error("unable to generate database key for wor request wait queue", zap.Error(err), zap.Any("jobID", request.GetJobId()), zap.Any("workID", request.GetRequestId()))
+			status.SetState(flex.Work_FAILED)
+			status.SetMessage("unable to generate database key for work request wait queue for job ID " + request.GetJobId() + ": " + err.Error())
 		}
 
 		key := createSubmissionID(baseKey, submissionIDPriority(work.submissionID))
 		_, waitEntry, commitAndReleaseWait, err := w.workWaitQueueJournal.CreateAndLockEntry(key)
 		if err != nil {
-			// TODO: return nil, fmt.Errorf("unable to create work journal entry for job ID %s work request ID %s: %w", request.GetJobId(), request.GetRequestId(), err)
+			w.log.Error("unable to create work journal entry for wor request wait queue", zap.Error(err), zap.Any("jobID", request.GetJobId()), zap.Any("workID", request.GetRequestId()))
+			status.SetState(flex.Work_FAILED)
+			status.SetMessage("unable to generate database key for work request wait queue for job ID " + request.GetJobId() + ": " + err.Error())
 		}
 
 		waitEntry.Value.ExecutionTime = retryTime.Unix()
 		waitEntry.Value.SubmissionID = work.submissionID
 		waitEntry.Value.WorkRequest = &workRequest{WorkRequest: request.WorkRequest}
 		waitEntry.Value.WorkResult = result
-
 		if err := commitAndReleaseWait(); err != nil {
-			w.log.Error("unable to release work wait queue journal entry", zap.Error(err), zap.Any("jobID", request.GetJobId()))
+			w.log.Error("unable to release work wait queue journal entry", zap.Error(err), zap.Any("jobID", request.GetJobId()), zap.Any("workID", request.GetRequestId()))
 		}
 
 		return