Merge pull request #160 from sonroyaalmerol/fix-backup

fix backup err panic and task not returning
sonroyaalmerol · Feb 13, 2025 · 933f1c1 · 933f1c1
2 parents 1c32b0d + 384537b
commit 933f1c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/internal/backend/backup/jobrun.go b/internal/backend/backup/jobrun.go
@@ -353,6 +353,7 @@ func RunBackup(ctx context.Context, job *types.Job, storeInstance *store.Store,
 				}
 
 				// Signal that the cmd.Wait goroutine has started.
+				autoOp.Task = op.Task
 				close(autoOp.started)
 
 				// Wait for the asynchronous backup process to finish.
@@ -363,7 +364,6 @@ func RunBackup(ctx context.Context, job *types.Job, storeInstance *store.Store,
 					continue
 				}
 				// A backup attempt succeeded.
-				autoOp.Task = op.Task
 				autoOp.err = nil
 				autoOp.BackupOp = op
 				close(autoOp.done)

diff --git a/internal/proxy/controllers/jobs/jobs.go b/internal/proxy/controllers/jobs/jobs.go
@@ -63,7 +63,7 @@ func ExtJsJobRunHandler(storeInstance *store.Store) http.HandlerFunc {
 		op := backup.RunBackup(context.Background(), job, storeInstance, false)
 		if waitErr := op.WaitForStart(); waitErr != nil {
 			syslog.L.Error(waitErr)
-			controllers.WriteErrorResponse(w, err)
+			controllers.WriteErrorResponse(w, waitErr)
 			return
 		}
 		task := op.Task
@@ -74,6 +74,7 @@ func ExtJsJobRunHandler(storeInstance *store.Store) http.HandlerFunc {
 		response.Status = http.StatusOK
 		response.Success = true
 		json.NewEncoder(w).Encode(response)
+		return
 	}
 }