CBG-5426 drop duplicate lasterror field with separate locks (#8338)

Author: torcolvin

db/background_mgr.go

@@ -78,7 +78,6 @@ type BackgroundManager struct {
 	status                                 BackgroundManagerStatus
 	statusLock                             sync.RWMutex
 	name                                   string
-	lastError                              error
 	terminator                             *base.SafeTerminator
 	backgroundManagerStatusUpdateWaitGroup sync.WaitGroup
 	clusterAwareOptions                    *ClusterAwareBackgroundManagerOptions
@@ -456,10 +455,6 @@ func (b *BackgroundManager) getStatusWithPrevious(previous []byte) ([]byte, []by
 		backgroundStatus.State = BackgroundProcessStateCompleted
 	}
 
-	if b.lastError != nil {
-		backgroundStatus.LastErrorMessage = b.lastError.Error()
-	}
-
 	return b.Process.GetProcessStatus(backgroundStatus, previous)
 }
 
@@ -529,16 +524,18 @@ func (b *BackgroundManager) resetStatus() {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.lastError = nil
-	b.clearLastErrorMessage()
+	b.setLastErrorMessage("")
 	b.Process.ResetStatus()
 }
 
 // setLastErrorMessage sets the last error message
-func (b *BackgroundManager) clearLastErrorMessage() {
+func (b *BackgroundManager) setLastErrorMessage(msg string) {
 	b.statusLock.Lock()
 	defer b.statusLock.Unlock()
-	b.status.LastErrorMessage = ""
+	b.status.LastErrorMessage = msg
+	if msg != "" {
+		b.status.State = BackgroundProcessStateError
+	}
 }
 
 // Stop triggers a Stop of the background process. This will transition the state to BackgroundProcessStateStopping and
@@ -634,9 +631,7 @@ func (b *BackgroundManager) setStartTime(startTime time.Time) {
 func (b *BackgroundManager) SetError(err error) {
 	b.lock.Lock()
 	defer b.lock.Unlock()
-
-	b.lastError = err
-	b.setRunState(BackgroundProcessStateError)
+	b.setLastErrorMessage(err.Error())
 	b.Terminate()
 }